* 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
diff --git a/ChangeLog b/ChangeLog
index d427be8..e921ea5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,18 @@
+2006-01-10 Albert Astals Cid <aacid@kde.org>
+
+ * 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
+
2006-01-10 Kristian Høgsberg <krh@redhat.com>
* splash/Makefile.am: Only install splash headers if
diff --git a/configure.ac b/configure.ac
index 60a12d8..401244b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -243,19 +243,13 @@
AM_CONDITIONAL(BUILD_POPPLER_QT4, test x$enable_poppler_qt4 = xyes)
if test x$enable_poppler_qt4 = xyes; then
- POPPLER_FIND_QT4TEST(POPPLER_QTTEST)
+ POPPLER_FIND_QT4TEST(POPPLER_QTTEST,
+ [enable_poppler_qt4testlib="yes"],
+ [enable_poppler_qt4testlib="no"])
AC_SUBST(POPPLER_QTTEST_CXXFLAGS)
AC_SUBST(POPPLER_QTTEST_LIBS)
-fi
-
-if test x$have_qt4testlib = xno ; then
- AC_MSG_WARN([QtTestLib libraries not found])
-fi
-
-if test x$have_qt4testlib = xyes; then
- enable_poppler_qt4testlib="yes"
else
- enable_poppler_qt4testlib="no"
+ enable_poppler_qt4testlib="no"
fi
AM_CONDITIONAL(BUILD_POPPLER_QT4TESTS, test x$enable_poppler_qt4testlib = xyes)
diff --git a/m4/qt.m4 b/m4/qt.m4
index fc9d175..819d0db 100644
--- a/m4/qt.m4
+++ b/m4/qt.m4
@@ -156,6 +156,11 @@
qt4_incdirs="/usr/local/qt/include /usr/include/qt4 /usr/include/qt /usr/include /usr/X11R6/include/X11/qt /usr/X11R6/include/qt /usr/lib/qt/include"
qt4_libdirs="/usr/local/qt/lib /usr/lib/qt /usr/lib /usr/X11R6/lib/X11/qt /usr/X11R6/lib/qt /usr/lib/qt/lib"
+if test -n "$QTDIR" ; then
+ qt4_incdirs="$QTDIR/include $qt4_incdirs"
+ qt4_libdirs="$QTDIR/lib $qt4_libdirs"
+fi
+
dnl What to test
qt4test_test_include="QtTest/QtTest"
qt4test_test_la_library="libQtTest.la"
diff --git a/qt/poppler-page-transition.cc b/qt/poppler-page-transition.cc
index f82aa63..492ebb2 100644
--- a/qt/poppler-page-transition.cc
+++ b/qt/poppler-page-transition.cc
@@ -19,7 +19,7 @@
#include "Object.h"
#include "Error.h"
#include "poppler-page-transition.h"
-#include "poppler-private.h"
+#include "poppler-page-transition-private.h"
namespace Poppler {
diff --git a/qt/poppler-page.cc b/qt/poppler-page.cc
index c2be9b6..61ceeee 100644
--- a/qt/poppler-page.cc
+++ b/qt/poppler-page.cc
@@ -28,6 +28,7 @@
#include <TextOutputDev.h>
#include <splash/SplashBitmap.h>
#include "poppler-private.h"
+#include "poppler-page-transition-private.h"
namespace Poppler {
diff --git a/qt/poppler-private.h b/qt/poppler-private.h
index 7ceaaff..c376d18 100644
--- a/qt/poppler-private.h
+++ b/qt/poppler-private.h
@@ -53,9 +53,4 @@
SplashOutputDev *m_outputDev;
};
-class PageTransitionParams {
- public:
- Object *dictObj;
-};
-
}
diff --git a/qt4/src/Makefile.am b/qt4/src/Makefile.am
index dff866e..66ed55b 100644
--- a/qt4/src/Makefile.am
+++ b/qt4/src/Makefile.am
@@ -1,6 +1,7 @@
INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/poppler \
+ -I$(top_srcdir)/qt \
$(POPPLER_QT4_CXXFLAGS)
diff --git a/qt4/src/poppler-page.cc b/qt4/src/poppler-page.cc
index f625beb..560390f 100644
--- a/qt4/src/poppler-page.cc
+++ b/qt4/src/poppler-page.cc
@@ -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 {
diff --git a/qt4/src/poppler-qt4.h b/qt4/src/poppler-qt4.h
index 61987c5..08973cd 100644
--- a/qt4/src/poppler-qt4.h
+++ b/qt4/src/poppler-qt4.h
@@ -26,7 +26,7 @@
#include <QtCore/QDateTime>
#include <QtGui/QPixmap>
-#include <PageTransition.h>
+#include <poppler-page-transition.h>
/**
The Poppler Qt bindings
diff --git a/qt4/tests/Makefile.am b/qt4/tests/Makefile.am
index 4c4d05b..a2241f7 100644
--- a/qt4/tests/Makefile.am
+++ b/qt4/tests/Makefile.am
@@ -2,6 +2,7 @@
-I$(top_srcdir) \
-I$(top_srcdir)/poppler \
-I$(top_srcdir)/qt4/src \
+ -I$(top_srcdir)/qt \
$(POPPLER_QT4_CXXFLAGS) \
$(POPPLER_QTTEST_CXXFLAGS)
