From 1a0d5aeb9197ea0c3432903c402d8449bea9f6b4 Mon Sep 17 00:00:00 2001
From: axis <qt-info@nokia.com>
Date: Wed, 27 Apr 2011 13:01:17 +0200
Subject: Fixes for the second final push (the first one failed).

---
 patches/0031-Extended-module-profiles.patch | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'patches/0031-Extended-module-profiles.patch')

diff --git a/patches/0031-Extended-module-profiles.patch b/patches/0031-Extended-module-profiles.patch
index 5c742c2..ef5b35e 100644
--- a/patches/0031-Extended-module-profiles.patch
+++ b/patches/0031-Extended-module-profiles.patch
@@ -1,4 +1,4 @@
-From 3bc29615959e2b22d89ffb44955a5b2898e963c0 Mon Sep 17 00:00:00 2001
+From 22d771445cedc07b3a806859cb56aaa35ff9dad1 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,7 +43,7 @@ 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 fe9e311..c92af3f 100755
+index 9a04380..5888b1b 100755
 --- a/qtbase/configure
 +++ b/qtbase/configure
 @@ -6958,12 +6958,13 @@ esac
@@ -62,7 +62,7 @@ index fe9e311..c92af3f 100755
      if [ "$CFG_PHONON_BACKEND" = "yes" ]; then
          QT_CONFIG="$QT_CONFIG phonon-backend"
      fi
-@@ -7539,17 +7540,19 @@ if [ "$CFG_XMLPATTERNS" = "auto" -a "$CFG_EXCEPTIONS" != "no" ]; then
+@@ -7538,17 +7539,19 @@ if [ "$CFG_XMLPATTERNS" = "auto" -a "$CFG_EXCEPTIONS" != "no" ]; then
  elif [ "$CFG_EXCEPTIONS" = "no" ]; then
      CFG_XMLPATTERNS="no"
  fi
@@ -92,7 +92,7 @@ index fe9e311..c92af3f 100755
  
  if [ "$CFG_AUDIO_BACKEND" = "yes" ]; then
      QT_CONFIG="$QT_CONFIG audio-backend"
-@@ -7575,26 +7578,24 @@ if [ "$CFG_WEBKIT" != "no" ]; then
+@@ -7574,26 +7577,24 @@ if [ "$CFG_WEBKIT" != "no" ]; then
  fi
  
  if [ "$CFG_WEBKIT" != "no" ]; then
@@ -127,7 +127,7 @@ index fe9e311..c92af3f 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."
-@@ -7613,11 +7614,12 @@ elif [ "$CFG_SCRIPT" = "no" ]; then
+@@ -7612,11 +7613,12 @@ elif [ "$CFG_SCRIPT" = "no" ]; then
      CFG_SCRIPTTOOLS="no"
  fi
  
@@ -145,7 +145,7 @@ index fe9e311..c92af3f 100755
  
  
  if [ "$CFG_DECLARATIVE" = "yes" ]; then
-@@ -7635,7 +7637,8 @@ if [ "$CFG_DECLARATIVE" = "auto" ]; then
+@@ -7634,7 +7636,8 @@ if [ "$CFG_DECLARATIVE" = "auto" ]; then
  fi
  
  if [ "$CFG_DECLARATIVE" = "yes" ]; then
@@ -288,7 +288,7 @@ index 7f0a5d3..01340ac 100644
  QT.designer.depends = xml
 +QT.designer.DEFINES = QT_DESIGNER_LIB
 diff --git a/qttools/modules/qt_help.pri b/qttools/modules/qt_help.pri
-index f36858f..d99f57aa 100644
+index f36858f..d99f57a 100644
 --- a/qttools/modules/qt_help.pri
 +++ b/qttools/modules/qt_help.pri
 @@ -9,3 +9,4 @@ QT.help.private_includes = $$QT_MODULE_INCLUDE_BASE/QtHelp/private
@@ -319,5 +319,5 @@ index d67a720..a5a50e6 100644
 +
 +QT_CONFIG += xmlpatterns
 -- 
-1.7.5.rc2.4.g4d8b3
+1.7.3.4
 
-- 
cgit v1.2.3