[poppler] Branch 'poppler-0.12' - CMakeLists.txt configure.ac

Albert Astals Cid aacid at kemper.freedesktop.org
Mon Jan 4 10:38:53 PST 2010


 CMakeLists.txt |    2 +-
 configure.ac   |    8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 42359d6f75ca33f1d04a9f129b61725958686879
Author: Albert Astals Cid <aacid at kde.org>
Date:   Mon Jan 4 18:36:01 2010 +0000

    Require Qt 4.4
    
    This updates the requirement to real requirement

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ba0b07c..5d5be7b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -39,7 +39,7 @@ set(TEXTOUT_WORD_LIST ON)
 
 # setting the minimum required versions for some components
 set(QT3_MIN_VERSION "3.3.0")
-set(QT4_MIN_VERSION "4.3.0")
+set(QT4_MIN_VERSION "4.4.0")
 set(CAIRO_VERSION "1.8.4")
 
 macro_bool_to_01(ENABLE_SPLASH HAVE_SPLASH)
diff --git a/configure.ac b/configure.ac
index ae9c264..f7355b8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -402,17 +402,17 @@ AC_ARG_ENABLE(poppler-qt4,
               enable_poppler_qt4="try")
 if test x$enable_poppler_qt4 = xyes; then
   PKG_CHECK_MODULES(POPPLER_QT4, 
-	            QtCore >= 4.3.0 QtGui >= 4.3.0 QtXml >= 4.3.0)
+	            QtCore >= 4.4.0 QtGui >= 4.4.0 QtXml >= 4.4.0)
   PKG_CHECK_MODULES(POPPLER_QT4_TEST, 
-	            QtTest >= 4.3.0)
+	            QtTest >= 4.4.0)
 elif test x$enable_poppler_qt4 = xtry; then
   PKG_CHECK_MODULES(POPPLER_QT4,
-                    QtCore >= 4.3.0 QtGui >= 4.3.0 QtXml >= 4.3.0,
+                    QtCore >= 4.4.0 QtGui >= 4.4.0 QtXml >= 4.4.0,
                     [enable_poppler_qt4="yes"],
                     [enable_poppler_qt4="no"])
   if test x$enable_poppler_qt4 = xyes; then
     PKG_CHECK_MODULES(POPPLER_QT4_TEST,
-                    QtTest >= 4.3.0,
+                    QtTest >= 4.4.0,
                     [enable_poppler_qt4="yes"],
                     [enable_poppler_qt4="no"])
   fi


More information about the poppler mailing list