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

[Albert Astals Cid]

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

New commits:
commit aa6205d195c56a77e897bad125bf213aba138422
Author: Jason Crain <jason at aquaticape.us>
Date:   Mon Jul 7 23:52:39 2014 -0500

    Increase required Qt4 version to 4.7.0
    
    We use Qt::LayoutDirectionAuto, introduced in 4.7.0.
    
    bug #81005

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6089cd6..cc7a8c6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -86,7 +86,7 @@ set(OPI_SUPPORT ON)
 set(TEXTOUT_WORD_LIST ON)
 
 # setting the minimum required versions for some components
-set(QT4_MIN_VERSION "4.4.0")
+set(QT4_MIN_VERSION "4.7.0")
 set(CAIRO_VERSION "1.10.0")
 set(GLIB_REQUIRED "2.18")
 
diff --git a/configure.ac b/configure.ac
index 44d33a7..c9dd0bb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -568,17 +568,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.4.0 QtGui >= 4.4.0 QtXml >= 4.4.0)
+	            QtCore >= 4.7.0 QtGui >= 4.7.0 QtXml >= 4.7.0)
   PKG_CHECK_MODULES(POPPLER_QT4_TEST, 
-	            QtTest >= 4.4.0)
+	            QtTest >= 4.7.0)
 elif test x$enable_poppler_qt4 = xtry; then
   PKG_CHECK_MODULES(POPPLER_QT4,
-                    QtCore >= 4.4.0 QtGui >= 4.4.0 QtXml >= 4.4.0,
+                    QtCore >= 4.7.0 QtGui >= 4.7.0 QtXml >= 4.7.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.4.0,
+                    QtTest >= 4.7.0,
                     [enable_poppler_qt4="yes"],
                     [enable_poppler_qt4="no"])
   fi