Attachment 102409 Details for Bug 81005 – Increase required Qt4 version

[patch] Increase required Qt4 version

Increase-required-Qt4-version.patch (text/plain), 1.79 KB, created by Jason Crain on 2014-07-08 05:06:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jason Crain

Created: 2014-07-08 05:06:51 UTC

Size: 1.79 KB

patch

obsolete

>From ccddd1d2ca744a2d31de4e907043efc28320c3a7 Mon Sep 17 00:00:00 2001
>From: Jason Crain <jason@aquaticape.us>
>Date: Mon, 7 Jul 2014 23:52:39 -0500
>Subject: [PATCH] Increase required Qt4 version to 4.7.0
>
>We use Qt::LayoutDirectionAuto, introduced in 4.7.0.
>
>bug #81005
>---
> CMakeLists.txt | 2 +-
> configure.ac   | 8 ++++----
> 2 files changed, 5 insertions(+), 5 deletions(-)
>
>diff --git a/CMakeLists.txt b/CMakeLists.txt
>index 7ceb643..8c4e2eb 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 4d55bec..81367f1 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
>-- 
>2.0.0
>

Actions: View | Splinter Review

Attachments on bug 81005: 102409

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.