diff options
Diffstat (limited to 'patches/0031-Extended-module-profiles.patch')
| -rw-r--r-- | patches/0031-Extended-module-profiles.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/patches/0031-Extended-module-profiles.patch b/patches/0031-Extended-module-profiles.patch index 5d678a2..5c742c2 100644 --- a/patches/0031-Extended-module-profiles.patch +++ b/patches/0031-Extended-module-profiles.patch @@ -1,4 +1,4 @@ -From 62a116af799172ba600b236dde4dd0e91e92c83f Mon Sep 17 00:00:00 2001 +From 3bc29615959e2b22d89ffb44955a5b2898e963c0 Mon Sep 17 00:00:00 2001 From: axis <qt-info@nokia.com> Date: Mon, 3 Jan 2011 19:01:57 +0100 Subject: [PATCH] Extended module profiles. @@ -43,10 +43,10 @@ index 76ad617..5554999 100644 + warning("Attempted to include $$QT.qt3support.name in the build, but $$QT.gui.name was not built with $$QT.qt3support.name enabled.") +} diff --git a/qtbase/configure b/qtbase/configure -index 7fd1cf3..10f6180 100755 +index fe9e311..c92af3f 100755 --- a/qtbase/configure +++ b/qtbase/configure -@@ -6911,12 +6911,13 @@ esac +@@ -6958,12 +6958,13 @@ esac # enable Qt 3 support functionality if [ "$CFG_QT3SUPPORT" = "yes" ]; then @@ -62,7 +62,7 @@ index 7fd1cf3..10f6180 100755 if [ "$CFG_PHONON_BACKEND" = "yes" ]; then QT_CONFIG="$QT_CONFIG phonon-backend" fi -@@ -7493,17 +7494,19 @@ if [ "$CFG_XMLPATTERNS" = "auto" -a "$CFG_EXCEPTIONS" != "no" ]; then +@@ -7539,17 +7540,19 @@ if [ "$CFG_XMLPATTERNS" = "auto" -a "$CFG_EXCEPTIONS" != "no" ]; then elif [ "$CFG_EXCEPTIONS" = "no" ]; then CFG_XMLPATTERNS="no" fi @@ -92,7 +92,7 @@ index 7fd1cf3..10f6180 100755 if [ "$CFG_AUDIO_BACKEND" = "yes" ]; then QT_CONFIG="$QT_CONFIG audio-backend" -@@ -7529,26 +7532,24 @@ if [ "$CFG_WEBKIT" != "no" ]; then +@@ -7575,26 +7578,24 @@ if [ "$CFG_WEBKIT" != "no" ]; then fi if [ "$CFG_WEBKIT" != "no" ]; then @@ -127,7 +127,7 @@ index 7fd1cf3..10f6180 100755 if [ "$CFG_SCRIPTTOOLS" = "yes" -a "$CFG_SCRIPT" = "no" ]; then echo "QtScriptTools was requested, but it can't be built due to QtScript being disabled." -@@ -7567,11 +7568,12 @@ elif [ "$CFG_SCRIPT" = "no" ]; then +@@ -7613,11 +7614,12 @@ elif [ "$CFG_SCRIPT" = "no" ]; then CFG_SCRIPTTOOLS="no" fi @@ -145,7 +145,7 @@ index 7fd1cf3..10f6180 100755 if [ "$CFG_DECLARATIVE" = "yes" ]; then -@@ -7589,7 +7591,8 @@ if [ "$CFG_DECLARATIVE" = "auto" ]; then +@@ -7635,7 +7637,8 @@ if [ "$CFG_DECLARATIVE" = "auto" ]; then fi if [ "$CFG_DECLARATIVE" = "yes" ]; then @@ -319,5 +319,5 @@ index d67a720..a5a50e6 100644 + +QT_CONFIG += xmlpatterns -- -1.7.3.2.343.g7d43d +1.7.5.rc2.4.g4d8b3 |