[poppler] poppler/qt4/src: Makefile.am, 1.4, 1.5 poppler-page.cc, 1.13, 1.14 poppler-qt4.h, 1.22, 1.23

[Albert Astals Cid]

Update of /cvs/poppler/poppler/qt4/src
In directory gabe:/tmp/cvs-serv12650/qt4/src

Modified Files:
	Makefile.am poppler-page.cc poppler-qt4.h 
Log Message:
        * configure.ac:
        * m4/qt.m4: Fix bugs created when splitting the code from
        configure.ac, take QTDIR into account when looking for QtTestLib and
        do not die if it is not found as it is not mandatory
        * qt/poppler-page-transition.cc:
        * qt/poppler-page.cc:
        * qt/poppler-private.h:
        * qt4/tests/Makefile.am:
        * qt4/src/poppler-qt4.h:
        * qt4/src/poppler-page.cc:
        * qt4/src/Makefile.am: Fix mess created my the moving and renaming of
        PageTransition.cc


Index: Makefile.am
===================================================================
RCS file: /cvs/poppler/poppler/qt4/src/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- Makefile.am	6 Jan 2006 10:05:59 -0000	1.4
+++ Makefile.am	10 Jan 2006 21:57:28 -0000	1.5
@@ -1,6 +1,7 @@
 INCLUDES =					\
 	-I$(top_srcdir)				\
 	-I$(top_srcdir)/poppler			\
+	-I$(top_srcdir)/qt			\
 	$(POPPLER_QT4_CXXFLAGS)
 
 

Index: poppler-page.cc
===================================================================
RCS file: /cvs/poppler/poppler/qt4/src/poppler-page.cc,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- poppler-page.cc	5 Jan 2006 13:53:58 -0000	1.13
+++ poppler-page.cc	10 Jan 2006 21:57:28 -0000	1.14
@@ -26,12 +26,12 @@
 #include <Catalog.h>
 #include <ErrorCodes.h>
 #include <ArthurOutputDev.h>
-#include <Private.h>
 #include <SplashOutputDev.h>
 #include <TextOutputDev.h>
 #include <splash/SplashBitmap.h>
 
 #include "poppler-private.h"
+#include "poppler-page-transition-private.h"
 
 namespace Poppler {
 

Index: poppler-qt4.h
===================================================================
RCS file: /cvs/poppler/poppler/qt4/src/poppler-qt4.h,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- poppler-qt4.h	5 Jan 2006 13:53:58 -0000	1.22
+++ poppler-qt4.h	10 Jan 2006 21:57:28 -0000	1.23
@@ -26,7 +26,7 @@
 #include <QtCore/QDateTime>
 #include <QtGui/QPixmap>
 
-#include <PageTransition.h>
+#include <poppler-page-transition.h>
 
 /**
    The Poppler Qt bindings