Rebase ontop of latest master

23 files changed, 109 insertions, 94 deletions

diff --git a/modularize b/modularize
index 6bd78da..bd686db 100755
--- a/modularize
+++ b/modularize
@@ -42,7 +42,7 @@ push(@INC, "$basepath/scripts");
 # Using option -bleeding will avoid these, and just try to run on the current branch you're in
 # if that is successful, you should update the SHA1 below to reflect that.
 my $good_47_sha1 = '770d5468a87c84cc435eefaa2a234f8c3b87f8c2';
-my $good_master_sha1 = 'f08dba7fbbc53f4dcc8cc431e69c74192141eeba';
+my $good_master_sha1 = '7ef9f99301a7c71fdb835f9e1f27d3111557aa2e';
 
 our @repos = ('qtbase', 'qtsvg', 'qtdeclarative', 'qt3support', 'qtactiveqt',
               'qtscript', 'qtphonon', 'qtmultimedia', 'qttools', 'qtxmlpatterns',
diff --git a/patches/0001-Some-changes-for-qtbase.patch b/patches/0001-Some-changes-for-qtbase.patch
index 4786e55..4810e68 100644
--- a/patches/0001-Some-changes-for-qtbase.patch
+++ b/patches/0001-Some-changes-for-qtbase.patch
@@ -1,4 +1,4 @@
-From f9c8d4dc3ee116478480ec6ceb023bb482255c46 Mon Sep 17 00:00:00 2001
+From 01ec70f4e071494e1ee9337295b604cda5b02d6c Mon Sep 17 00:00:00 2001
 From: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
 Date: Mon, 8 Nov 2010 20:09:10 -0600
 Subject: [PATCH] Some changes for qtbase
@@ -57,10 +57,10 @@ index 32b5384..9d5eece 100755
  my %inject_headers = ( "$basedir/src/corelib/global" => ( "qconfig.h" ) ); # all from build dir
  
 diff --git a/qtbase/configure b/qtbase/configure
-index 99b79fc..5238c34 100755
+index 96895ed..8c2c185 100755
 --- a/qtbase/configure
 +++ b/qtbase/configure
-@@ -8769,11 +8769,11 @@ EXEC=""
+@@ -8821,11 +8821,11 @@ EXEC=""
  
  echo "Finding project files. Please wait..."
  if [ "$CFG_NOPROCESS" != "yes" ]; then
@@ -327,10 +327,10 @@ index 4736d09..ca42da6 100644
              debug-$${subtarget}.depends = $${subdir}$${QMAKE_DIR_SEP}$(MAKEFILE) $$EXTRA_DEBUG_TARGETS
              debug-$${subtarget}.commands = (cd $$subdir && $(MAKE) -f $(MAKEFILE) debug)
 diff --git a/qtbase/tools/configure/configureapp.cpp b/qtbase/tools/configure/configureapp.cpp
-index ab19a04..b74d610 100644
+index 494ea52..c6819db 100644
 --- a/qtbase/tools/configure/configureapp.cpp
 +++ b/qtbase/tools/configure/configureapp.cpp
-@@ -3858,7 +3858,7 @@ void Configure::generateMakefiles()
+@@ -3856,7 +3856,7 @@ void Configure::generateMakefiles()
                  }
                  // don't pass -spec - .qmake.cache has it already
                  args << "-r";
@@ -340,5 +340,5 @@ index ab19a04..b74d610 100644
                  args << buildPath;
                  if (!dictionary[ "QMAKEADDITIONALARGS" ].isEmpty())
 -- 
-1.7.3.2.343.g7d43d
+1.7.5.rc2.4.g4d8b3
 
diff --git a/patches/0003-Expose-source-and-build-directories-for-QtBase.patch b/patches/0003-Expose-source-and-build-directories-for-QtBase.patch
index 16de851..102d19c 100644
--- a/patches/0003-Expose-source-and-build-directories-for-QtBase.patch
+++ b/patches/0003-Expose-source-and-build-directories-for-QtBase.patch
@@ -1,4 +1,4 @@
-From 5297976a140beabcb731129a816d5720f92dfb8e Mon Sep 17 00:00:00 2001
+From d35548631229f954fc44b757dc21922ec47ea919 Mon Sep 17 00:00:00 2001
 From: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
 Date: Thu, 11 Nov 2010 09:35:09 -0600
 Subject: [PATCH] Expose source and build directories for QtBase
@@ -12,10 +12,10 @@ Also expose moc, uic, rcc, qdbusxml2cpp, include and lib
  create mode 100644 qtbase/mkspecs/features/qt_module.prf
 
 diff --git a/qtbase/configure b/qtbase/configure
-index 5238c34..1fc14e2 100755
+index 8c2c185..66464fa 100755
 --- a/qtbase/configure
 +++ b/qtbase/configure
-@@ -8254,10 +8254,10 @@ else
+@@ -8300,10 +8300,10 @@ else
          ln -s "$outpath/src/corelib/global/qconfig.h" "$conf"
      done
  fi
@@ -27,7 +27,7 @@ index 5238c34..1fc14e2 100755
  QTCONFIG="$outpath/mkspecs/qconfig.pri"
  QTCONFIG_CONFIG="$QTCONFIG_CONFIG no_mocdepend"
  [ -f "$QTCONFIG.tmp" ] && rm -f "$QTCONFIG.tmp"
-@@ -8352,23 +8352,19 @@ else
+@@ -8403,23 +8403,19 @@ else
  fi
  
  #-------------------------------------------------------------------------------
@@ -55,7 +55,7 @@ index 5238c34..1fc14e2 100755
  QMAKE_RCC        = \$\$QT_BUILD_TREE/bin/rcc
  QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp
  QMAKE_INCDIR_QT  = \$\$QT_BUILD_TREE/include
-@@ -8378,65 +8374,86 @@ EOF
+@@ -8429,65 +8425,86 @@ EOF
  
  # Ensure we can link to uninistalled libraries
  if [ "$XPLATFORM_MINGW" != "yes" ] && [ "$CFG_EMBEDDED" != "nacl" ] && linkerSupportsFlag -rpath-link "$outpath/lib"; then
@@ -182,10 +182,10 @@ index 0000000..9fe20c7
 +   debug(1, "Loaded qmodule.pri from ($$QMAKE_QT_MODULE)")
 +}
 diff --git a/qtbase/tools/configure/configureapp.cpp b/qtbase/tools/configure/configureapp.cpp
-index b74d610..5ec4cd6 100644
+index c6819db..46f1a87 100644
 --- a/qtbase/tools/configure/configureapp.cpp
 +++ b/qtbase/tools/configure/configureapp.cpp
-@@ -2913,63 +2913,101 @@ void Configure::generateCachefile()
+@@ -2911,63 +2911,101 @@ void Configure::generateCachefile()
      QFile cacheFile(buildPath + "/.qmake.cache");
      if (cacheFile.open(QFile::WriteOnly | QFile::Text)) { // Truncates any existing file.
          QTextStream cacheStream(&cacheFile);
@@ -311,7 +311,7 @@ index b74d610..5ec4cd6 100644
          configStream << "CONFIG+= ";
          configStream << dictionary[ "BUILD" ];
          if (dictionary[ "SHARED" ] == "yes")
-@@ -3029,26 +3067,6 @@ void Configure::generateCachefile()
+@@ -3027,26 +3065,6 @@ void Configure::generateCachefile()
                       << "QT_MINOR_VERSION = " << dictionary["VERSION_MINOR"] << endl
                       << "QT_PATCH_VERSION = " << dictionary["VERSION_PATCH"] << endl;
  
@@ -339,5 +339,5 @@ index b74d610..5ec4cd6 100644
          configFile.close();
      }
 -- 
-1.7.3.2.343.g7d43d
+1.7.5.rc2.4.g4d8b3
 
diff --git a/patches/0006-Make-syncqt-use-sync.profile-files-from-each-module.patch b/patches/0006-Make-syncqt-use-sync.profile-files-from-each-module.patch
index 5e99eef..f3ab87b 100644
--- a/patches/0006-Make-syncqt-use-sync.profile-files-from-each-module.patch
+++ b/patches/0006-Make-syncqt-use-sync.profile-files-from-each-module.patch
@@ -1,4 +1,4 @@
-From 72bf0df44486a5030e4ba47e9d4a25bee241f05e Mon Sep 17 00:00:00 2001
+From be0dd0f2149064e9655edaa5d7c24bef3e034dd5 Mon Sep 17 00:00:00 2001
 From: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
 Date: Mon, 15 Nov 2010 13:55:17 -0600
 Subject: [PATCH] Make syncqt use sync.profile files from each module
@@ -251,10 +251,10 @@ index b8162d2..7e5fc44 100755
                  }
              }
 diff --git a/qtbase/configure b/qtbase/configure
-index 1fc14e2..7fd1cf3 100755
+index 66464fa..fe9e311 100755
 --- a/qtbase/configure
 +++ b/qtbase/configure
-@@ -2542,8 +2542,7 @@ if [ "$OPT_SHADOW" = "yes" ]; then
+@@ -2550,8 +2550,7 @@ if [ "$OPT_SHADOW" = "yes" ]; then
      if [ -x "$relpath/bin/syncqt" ]; then
          mkdir -p "$outpath/bin"
          echo "#!/bin/sh" >"$outpath/bin/syncqt"
@@ -315,7 +315,7 @@ index 0000000..7d2e4b1
 +@ignore_for_qt_begin_namespace_check = ( "qconfig.h", "qconfig-dist.h", "qconfig-large.h", "qconfig-medium.h", "qconfig-minimal.h", "qconfig-small.h", "qfeatures.h", "qatomic_arch.h", "qatomic_windowsce.h", "qt_windows.h", "qatomic_macosx.h" );
 +@ignore_for_qt_module_check = ( "$modules{QtCore}/arch", "$modules{QtCore}/global", "$modules{QtTest}", "$modules{QtDBus}" );
 diff --git a/qtbase/tools/configure/configureapp.cpp b/qtbase/tools/configure/configureapp.cpp
-index 5ec4cd6..914061e 100644
+index 46f1a87..2d84ad5 100644
 --- a/qtbase/tools/configure/configureapp.cpp
 +++ b/qtbase/tools/configure/configureapp.cpp
 @@ -188,9 +188,7 @@ Configure::Configure(int& argc, char** argv)
@@ -330,5 +330,5 @@ index 5ec4cd6..914061e 100644
              }
          }
 -- 
-1.7.3.2.343.g7d43d
+1.7.5.rc2.4.g4d8b3
 
diff --git a/patches/0012-Have-qmake-run-syncqt-automatically-if-sync.profile-.patch b/patches/0012-Have-qmake-run-syncqt-automatically-if-sync.profile-.patch
index cfe6ea5..dc8b081 100644
--- a/patches/0012-Have-qmake-run-syncqt-automatically-if-sync.profile-.patch
+++ b/patches/0012-Have-qmake-run-syncqt-automatically-if-sync.profile-.patch
@@ -1,7 +1,8 @@
-From 40dea830548b86c4eebc6db9a04fcaac17858c91 Mon Sep 17 00:00:00 2001
+From 13f02fcd304c8160d11355eafa9cb9b1327f021b Mon Sep 17 00:00:00 2001
 From: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
 Date: Wed, 24 Nov 2010 19:56:41 -0600
-Subject: [PATCH] Have qmake run syncqt automatically, if sync.profile is detected
+Subject: [PATCH] Have qmake run syncqt automatically, if sync.profile is
+ detected
 
 This will normally only happen for top-level pro files,
 and syncqt is smart enough to not touch already existing
@@ -48,5 +49,5 @@ index 2e82f03..b8779c8 100644
 +    unset(PRO_BASENAME)
 +}
 -- 
-1.7.3.2.343.g7d43d
+1.7.5.rc2.4.g4d8b3
 
diff --git a/patches/0013-Add-module-specific-pris-and-make-syncqt-create-fwd-.patch b/patches/0013-Add-module-specific-pris-and-make-syncqt-create-fwd-.patch
index 86566bc..0973845 100644
--- a/patches/0013-Add-module-specific-pris-and-make-syncqt-create-fwd-.patch
+++ b/patches/0013-Add-module-specific-pris-and-make-syncqt-create-fwd-.patch
@@ -1,7 +1,8 @@
-From e5e18c4da35586931dae3c104e66cef8dc9267c3 Mon Sep 17 00:00:00 2001
+From bc218a6908c168da3ec38eeec557b2f81aea7b97 Mon Sep 17 00:00:00 2001
 From: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
 Date: Wed, 24 Nov 2010 20:21:06 -0600
-Subject: [PATCH] Add module specific pris, and make syncqt create fwd includes
+Subject: [PATCH] Add module specific pris, and make syncqt create fwd
+ includes
 
 The module specific pris define the modules
     name
@@ -425,5 +426,5 @@ index 6707cea..9548e0f 100644
 +    "QtXmlPatterns" => "$basedir/modules/qt_xmlpatterns.pri",
 +);
 -- 
-1.7.3.2.343.g7d43d
+1.7.5.rc2.4.g4d8b3
 
diff --git a/patches/0023-Make-QtScript-main-project-file-see-dependencies-pro.patch b/patches/0023-Make-QtScript-main-project-file-see-dependencies-pro.patch
index 05f664a..05b6293 100644
--- a/patches/0023-Make-QtScript-main-project-file-see-dependencies-pro.patch
+++ b/patches/0023-Make-QtScript-main-project-file-see-dependencies-pro.patch
@@ -1,7 +1,8 @@
-From 5819f1e311d9ea5619a154e91908bc27432d3858 Mon Sep 17 00:00:00 2001
+From 1dfdb058c0270d6bff523eecccb51d20bb1fec46 Mon Sep 17 00:00:00 2001
 From: Liang Qi <liang.qi@nokia.com>
 Date: Wed, 15 Dec 2010 07:33:19 +0100
-Subject: [PATCH] Make QtScript main project file see dependencies properly and etc.
+Subject: [PATCH] Make QtScript main project file see dependencies properly
+ and etc.
 
 This allows for running make -j<n> without breaking.
 Also add examples to the compile. But two of them were disabled for now because they need QUiLoader.
@@ -30,5 +31,5 @@ index 18663bb..d3b5dfd 100644
  target.path += $$[QT_INSTALL_PLUGINS]/script
  INSTALLS += target
 -- 
-1.7.3.2.343.g7d43d
+1.7.5.rc2.4.g4d8b3
 
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
 
diff --git a/patches/0036-Made-modules-that-depend-on-other-modules-add-their-.patch b/patches/0036-Made-modules-that-depend-on-other-modules-add-their-.patch
index ca93d54..7c6f2f0 100644
--- a/patches/0036-Made-modules-that-depend-on-other-modules-add-their-.patch
+++ b/patches/0036-Made-modules-that-depend-on-other-modules-add-their-.patch
@@ -1,7 +1,8 @@
-From 88922fd80297b74f547389db3ddfb9950e356145 Mon Sep 17 00:00:00 2001
+From 515a3c3470c51406acc36bf89c686b177e5c03c5 Mon Sep 17 00:00:00 2001
 From: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
 Date: Tue, 4 Jan 2011 16:37:10 +0100
-Subject: [PATCH] Made modules that depend on other modules add their include paths.
+Subject: [PATCH] Made modules that depend on other modules add their include
+ paths.
 
 This is needed so that header files which contain references to those
 modules (for example in templates) will have their include paths as
@@ -13,7 +14,7 @@ RevBy:    axis
  1 files changed, 6 insertions(+), 0 deletions(-)
 
 diff --git a/qtbase/mkspecs/features/qt.prf b/qtbase/mkspecs/features/qt.prf
-index 3b9c645..c1584fc 100644
+index 4d8e465..419bb92 100644
 --- a/qtbase/mkspecs/features/qt.prf
 +++ b/qtbase/mkspecs/features/qt.prf
 @@ -124,6 +124,7 @@ QMAKE_LIBDIR += $$QMAKE_LIBDIR_QT
@@ -39,5 +40,5 @@ index 3b9c645..c1584fc 100644
     !qt_compat_no_warning:QTDIR_build:warning(***USE of COMPAT inside of QTDIR!**) #just for us
     INCLUDEPATH *= $$QMAKE_INCDIR_QT/Qt
 -- 
-1.7.3.2.343.g7d43d
+1.7.5.rc2.4.g4d8b3
 
diff --git a/patches/0047-Added-new-QtWebKit-requirements-since-we-need-more-t.patch b/patches/0047-Added-new-QtWebKit-requirements-since-we-need-more-t.patch
index 077f3c4..7d33019 100644
--- a/patches/0047-Added-new-QtWebKit-requirements-since-we-need-more-t.patch
+++ b/patches/0047-Added-new-QtWebKit-requirements-since-we-need-more-t.patch
@@ -1,7 +1,8 @@
-From be93466ca5c7571beba46fe3ad803cb3c54ae597 Mon Sep 17 00:00:00 2001
+From 1a30b305fbf4c2c55866c8e8f93e63aaaa0bc46b Mon Sep 17 00:00:00 2001
 From: axis <qt-info@nokia.com>
 Date: Fri, 14 Jan 2011 16:14:17 +0100
-Subject: [PATCH] Added new QtWebKit requirements since we need more tools now.
+Subject: [PATCH] Added new QtWebKit requirements since we need more tools
+ now.
 
 ---
  qtdoc/doc/src/getting-started/installation.qdoc |   60 +++++++++++++++++++++++
@@ -93,5 +94,5 @@ index 26ccf88..4e6cc11 100644
  */
  
 -- 
-1.7.3.2.343.g7d43d
+1.7.5.rc2.4.g4d8b3
 
diff --git a/patches/0049-Remove-hardcoded-modules-in-configure-and-QT_CONFIG.patch b/patches/0049-Remove-hardcoded-modules-in-configure-and-QT_CONFIG.patch
index 50a97e6..2f0f726 100644
--- a/patches/0049-Remove-hardcoded-modules-in-configure-and-QT_CONFIG.patch
+++ b/patches/0049-Remove-hardcoded-modules-in-configure-and-QT_CONFIG.patch
@@ -1,4 +1,4 @@
-From 9395e18728811d9dbbd03f12cbbe97c00d9cfe1b Mon Sep 17 00:00:00 2001
+From 2bcc436c862e706c583a31242f72907188a2a635 Mon Sep 17 00:00:00 2001
 From: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
 Date: Mon, 21 Mar 2011 10:02:39 -0500
 Subject: [PATCH] Remove hardcoded modules in configure and QT_CONFIG
@@ -12,7 +12,7 @@ Also,
  1 files changed, 65 insertions(+), 67 deletions(-)
 
 diff --git a/qtbase/tools/configure/configureapp.cpp b/qtbase/tools/configure/configureapp.cpp
-index 914061e..6fe46b2 100644
+index 2d84ad5..9c2ce2c 100644
 --- a/qtbase/tools/configure/configureapp.cpp
 +++ b/qtbase/tools/configure/configureapp.cpp
 @@ -188,7 +188,7 @@ Configure::Configure(int& argc, char** argv)
@@ -24,7 +24,7 @@ index 914061e..6fe46b2 100644
                  syncqt_bat.close();
              }
          }
-@@ -1595,9 +1595,6 @@ void Configure::applySpecSpecifics()
+@@ -1593,9 +1593,6 @@ void Configure::applySpecSpecifics()
          dictionary[ "SQL_SQLITE" ]          = "yes";
          dictionary[ "SQL_SQLITE_LIB" ]      = "system";
  
@@ -34,7 +34,7 @@ index 914061e..6fe46b2 100644
      } else if (dictionary[ "XQMAKESPEC" ].startsWith("linux")) { //TODO actually wrong.
        //TODO
          dictionary[ "STYLE_WINDOWSXP" ]     = "no";
-@@ -2684,7 +2681,7 @@ void Configure::generateOutputVars()
+@@ -2682,7 +2679,7 @@ void Configure::generateOutputVars()
          qmakeVars += "QT_LFLAGS_SQLITE += " + escapeSeparators(dictionary["QT_LFLAGS_SQLITE"]);
  
      if (dictionary[ "QT3SUPPORT" ] == "yes")
@@ -43,7 +43,7 @@ index 914061e..6fe46b2 100644
  
      if (dictionary[ "OPENGL" ] == "yes")
          qtConfig += "opengl";
-@@ -2729,51 +2726,52 @@ void Configure::generateOutputVars()
+@@ -2727,51 +2724,52 @@ void Configure::generateOutputVars()
      if (dictionary[ "CETEST" ] == "yes")
          qtConfig += "cetest";
  
@@ -123,7 +123,7 @@ index 914061e..6fe46b2 100644
  
      if (dictionary["DIRECTWRITE"] == "yes")
          qtConfig += "directwrite";
-@@ -2924,81 +2922,81 @@ void Configure::generateCachefile()
+@@ -2922,81 +2920,81 @@ void Configure::generateCachefile()
      }
  
      // Generate qmodule.pri
@@ -241,5 +241,5 @@ index 914061e..6fe46b2 100644
  
      // Generate qconfig.pri
 -- 
-1.7.3.2.343.g7d43d
+1.7.5.rc2.4.g4d8b3
 
diff --git a/patches/0053-Removed-activeqt-references-from-Designer-which-is-i.patch b/patches/0053-Removed-activeqt-references-from-Designer-which-is-i.patch
index 03f567a..a0d3840 100644
--- a/patches/0053-Removed-activeqt-references-from-Designer-which-is-i.patch
+++ b/patches/0053-Removed-activeqt-references-from-Designer-which-is-i.patch
@@ -1,7 +1,8 @@
-From 9bf1320dd547ea3c84cbbf21bddaae714396e67d Mon Sep 17 00:00:00 2001
+From d74ddb408cbd761ca6ffa4ba0951729645ec070f Mon Sep 17 00:00:00 2001
 From: axis <qt-info@nokia.com>
 Date: Mon, 24 Jan 2011 11:35:32 +0100
-Subject: [PATCH] Removed activeqt references from Designer, which is in its own repo.
+Subject: [PATCH] Removed activeqt references from Designer, which is in its
+ own repo.
 
 ---
  qttools/src/designer/src/plugins/plugins.pro |    1 -
@@ -33,5 +34,5 @@ index 7332502..8b6a706 100644
  }
  
 -- 
-1.7.3.2.343.g7d43d
+1.7.5.rc2.4.g4d8b3
 
diff --git a/patches/0058-Use-the-install_name-linker-flag-on-Mac-for-the-fram.patch b/patches/0058-Use-the-install_name-linker-flag-on-Mac-for-the-fram.patch
index 0dc0e25..3bd374d 100644
--- a/patches/0058-Use-the-install_name-linker-flag-on-Mac-for-the-fram.patch
+++ b/patches/0058-Use-the-install_name-linker-flag-on-Mac-for-the-fram.patch
@@ -1,7 +1,8 @@
-From 4b482f3f68b4f0eb466c9d2aa3b7df62b5330b35 Mon Sep 17 00:00:00 2001
+From f2b7f258f06446af7be296831279d08f52e2ed29 Mon Sep 17 00:00:00 2001
 From: Prasanth Ullattil <prasanth.ullattil@nokia.com>
 Date: Tue, 25 Jan 2011 10:08:15 +0100
-Subject: [PATCH] Use the 'install_name' linker flag on Mac for the frameworks.
+Subject: [PATCH] Use the 'install_name' linker flag on Mac for the
+ frameworks.
 
 This is required for the frameworks outside the qtbase module.
 ---
@@ -9,7 +10,7 @@ This is required for the frameworks outside the qtbase module.
  1 files changed, 5 insertions(+), 0 deletions(-)
 
 diff --git a/qtbase/mkspecs/features/qt_module.prf b/qtbase/mkspecs/features/qt_module.prf
-index dbe863f..db8d235 100644
+index a263e28..a5a3fd1 100644
 --- a/qtbase/mkspecs/features/qt_module.prf
 +++ b/qtbase/mkspecs/features/qt_module.prf
 @@ -14,3 +14,8 @@ isEmpty(QMAKE_QT_MODULE)|!exists($$QMAKE_QT_MODULE) {
@@ -22,5 +23,5 @@ index dbe863f..db8d235 100644
 +   }
 +}
 -- 
-1.7.3.2.343.g7d43d
+1.7.5.rc2.4.g4d8b3
 
diff --git a/patches/0060-Use-the-MODULE_LIBS-instead-of-QMAKE_LIBDIR_QT-for-f.patch b/patches/0060-Use-the-MODULE_LIBS-instead-of-QMAKE_LIBDIR_QT-for-f.patch
index 66976db..0cdabe8 100644
--- a/patches/0060-Use-the-MODULE_LIBS-instead-of-QMAKE_LIBDIR_QT-for-f.patch
+++ b/patches/0060-Use-the-MODULE_LIBS-instead-of-QMAKE_LIBDIR_QT-for-f.patch
@@ -1,14 +1,15 @@
-From 45332fdf9fb4971c26978057214af64ecb958cf4 Mon Sep 17 00:00:00 2001
+From e8a59cc11de85f30f12606737d71f367167ca16c Mon Sep 17 00:00:00 2001
 From: Prasanth Ullattil <prasanth.ullattil@nokia.com>
 Date: Tue, 25 Jan 2011 14:48:39 +0100
-Subject: [PATCH] Use the MODULE_LIBS instead of QMAKE_LIBDIR_QT for frameworks.
+Subject: [PATCH] Use the MODULE_LIBS instead of QMAKE_LIBDIR_QT for
+ frameworks.
 
 ---
  qtbase/mkspecs/features/qt_functions.prf |    4 ++--
  1 files changed, 2 insertions(+), 2 deletions(-)
 
 diff --git a/qtbase/mkspecs/features/qt_functions.prf b/qtbase/mkspecs/features/qt_functions.prf
-index 312a0b2..96366de 100644
+index c44419c..b16c848 100644
 --- a/qtbase/mkspecs/features/qt_functions.prf
 +++ b/qtbase/mkspecs/features/qt_functions.prf
 @@ -106,7 +106,7 @@ defineTest(qtAddModule) {
@@ -30,5 +31,5 @@ index 312a0b2..96366de 100644
                  QMAKE_FRAMEWORKPATH *= $${frmwrk_dir}
                  FRAMEWORK_INCLUDE = $$frmwrk_dir/$${MODULE_NAME}.framework/Headers
 -- 
-1.7.3.2.343.g7d43d
+1.7.5.rc2.4.g4d8b3
 
diff --git a/patches/0063-Changed-various-path-references-in-ActiveQt-to-match.patch b/patches/0063-Changed-various-path-references-in-ActiveQt-to-match.patch
index 93751f8..373fddd 100644
--- a/patches/0063-Changed-various-path-references-in-ActiveQt-to-match.patch
+++ b/patches/0063-Changed-various-path-references-in-ActiveQt-to-match.patch
@@ -1,7 +1,8 @@
-From 57e550ec07e65269c12f3ab3960e06c697949477 Mon Sep 17 00:00:00 2001
+From 62c5615e584e3f927685f4fc30322fbb1838b2a7 Mon Sep 17 00:00:00 2001
 From: axis <qt-info@nokia.com>
 Date: Thu, 27 Jan 2011 09:34:10 +0100
-Subject: [PATCH] Changed various path references in ActiveQt to match modularization.
+Subject: [PATCH] Changed various path references in ActiveQt to match
+ modularization.
 
 ---
  qtactiveqt/src/activeqt/container/container.pro |    6 ++++--
@@ -75,5 +76,5 @@ index 89f8067..07df464 100644
  
  }
 -- 
-1.7.3.2.343.g7d43d
+1.7.5.rc2.4.g4d8b3
 
diff --git a/patches/0066-Made-ActiveQt-Designer-plugin-refer-to-right-source-.patch b/patches/0066-Made-ActiveQt-Designer-plugin-refer-to-right-source-.patch
index 4d0c6cf..0970e13 100644
--- a/patches/0066-Made-ActiveQt-Designer-plugin-refer-to-right-source-.patch
+++ b/patches/0066-Made-ActiveQt-Designer-plugin-refer-to-right-source-.patch
@@ -1,7 +1,8 @@
-From a721b597fe434aa888463553ef00a808a7831ba6 Mon Sep 17 00:00:00 2001
+From 900bcda0e3684f0b932e91426e624e4212531e0d Mon Sep 17 00:00:00 2001
 From: axis <qt-info@nokia.com>
 Date: Thu, 27 Jan 2011 10:16:36 +0100
-Subject: [PATCH] Made ActiveQt Designer plugin refer to right source location.
+Subject: [PATCH] Made ActiveQt Designer plugin refer to right source
+ location.
 
 ---
  .../src/designer/src/plugins/activeqt/activeqt.pro |   11 ++++++-----
@@ -43,5 +44,5 @@ index f58df8a..d71e387 100644
  # install
  target.path = $$[QT_INSTALL_PLUGINS]/designer
 -- 
-1.7.3.2.343.g7d43d
+1.7.5.rc2.4.g4d8b3
 
diff --git a/patches/0072-Made-sure-syncqt-gets-called-correctly-even-if-it-is.patch b/patches/0072-Made-sure-syncqt-gets-called-correctly-even-if-it-is.patch
index 30482c6..ea8983b 100644
--- a/patches/0072-Made-sure-syncqt-gets-called-correctly-even-if-it-is.patch
+++ b/patches/0072-Made-sure-syncqt-gets-called-correctly-even-if-it-is.patch
@@ -1,7 +1,8 @@
-From 4e5cafb84a28082090da75c4781930cc987c019b Mon Sep 17 00:00:00 2001
+From 97113c469f9f8903279c8c8da8e20ccad253e79d Mon Sep 17 00:00:00 2001
 From: axis <qt-info@nokia.com>
 Date: Fri, 28 Jan 2011 15:17:00 +0100
-Subject: [PATCH] Made sure syncqt gets called correctly even if it is not in the PATH.
+Subject: [PATCH] Made sure syncqt gets called correctly even if it is not in
+ the PATH.
 
 ---
  qtbase/bin/syncqt.bat                   |    6 ++++--
@@ -37,5 +38,5 @@ index b8779c8..adcdbb7 100644
      unset(PRO_BASENAME)
  }
 -- 
-1.7.3.2.343.g7d43d
+1.7.5.rc2.4.g4d8b3
 
diff --git a/patches/0078-Make-qmake-respect-subdir-.CONFIG-no_default_install.patch b/patches/0078-Make-qmake-respect-subdir-.CONFIG-no_default_install.patch
index 7df41f0..034c4a4 100644
--- a/patches/0078-Make-qmake-respect-subdir-.CONFIG-no_default_install.patch
+++ b/patches/0078-Make-qmake-respect-subdir-.CONFIG-no_default_install.patch
@@ -1,4 +1,4 @@
-From a86c1895c7a209947d87ebfce25761c7638e9cac Mon Sep 17 00:00:00 2001
+From 2dafeb1c875f81af7815e338a6320c6adb95d2e6 Mon Sep 17 00:00:00 2001
 From: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
 Date: Thu, 24 Feb 2011 13:01:18 -0600
 Subject: [PATCH] Make qmake respect <subdir>.CONFIG = no_default_install
@@ -9,10 +9,10 @@ It already respects no_default_target
  1 files changed, 4 insertions(+), 0 deletions(-)
 
 diff --git a/qtbase/qmake/generators/makefile.cpp b/qtbase/qmake/generators/makefile.cpp
-index 595768f..4c41559 100644
+index 9e2be31..1c4f74b2 100644
 --- a/qtbase/qmake/generators/makefile.cpp
 +++ b/qtbase/qmake/generators/makefile.cpp
-@@ -2567,6 +2567,10 @@ MakefileGenerator::writeSubTargets(QTextStream &t, QList<MakefileGenerator::SubT
+@@ -2569,6 +2569,10 @@ MakefileGenerator::writeSubTargets(QTextStream &t, QList<MakefileGenerator::SubT
                  && project->values(subTarget->name + ".CONFIG").indexOf("no_default_target") != -1) {
                  continue;
              }
@@ -24,5 +24,5 @@ index 595768f..4c41559 100644
              if(flags & SubTargetOrdered)
                  targetRule += "-ordered";
 -- 
-1.7.3.2.343.g7d43d
+1.7.5.rc2.4.g4d8b3
 
diff --git a/patches/0097-Fixed-maketestselftest-after-guiapplauncher-was-made.patch b/patches/0097-Fixed-maketestselftest-after-guiapplauncher-was-made.patch
index 2fe8a2e..25536a0 100644
--- a/patches/0097-Fixed-maketestselftest-after-guiapplauncher-was-made.patch
+++ b/patches/0097-Fixed-maketestselftest-after-guiapplauncher-was-made.patch
@@ -1,7 +1,8 @@
-From 3508e33061e9decbb53cdc98a03d781f30877e04 Mon Sep 17 00:00:00 2001
+From fb1f2fa3e375382df16d1e9c8b5137ddad3e96e5 Mon Sep 17 00:00:00 2001
 From: axis <qt-info@nokia.com>
 Date: Tue, 22 Mar 2011 09:19:46 +0100
-Subject: [PATCH] Fixed maketestselftest after guiapplauncher was made a global test.
+Subject: [PATCH] Fixed maketestselftest after guiapplauncher was made a
+ global test.
 
 ---
  .../auto/maketestselftest/tst_maketestselftest.cpp |    3 ++-
@@ -22,5 +23,5 @@ index 8ed8cb8..9fbfd5a 100644
              continue;
          }
 -- 
-1.7.3.4
+1.7.5.rc2.4.g4d8b3
 
diff --git a/patches/0098-Introduced-the-QT.-module-.plugins-variable-to-modul.patch b/patches/0098-Introduced-the-QT.-module-.plugins-variable-to-modul.patch
index 43cd0b8..2076e0f 100644
--- a/patches/0098-Introduced-the-QT.-module-.plugins-variable-to-modul.patch
+++ b/patches/0098-Introduced-the-QT.-module-.plugins-variable-to-modul.patch
@@ -1,7 +1,8 @@
-From 34c8c32c16cabc56ba72ed4b5b56919f5676970e Mon Sep 17 00:00:00 2001
+From 232edb9da29393cc92a996955622aa9f90070f80 Mon Sep 17 00:00:00 2001
 From: axis <qt-info@nokia.com>
 Date: Tue, 22 Mar 2011 13:20:53 +0100
-Subject: [PATCH] Introduced the QT.<module>.plugins variable to module profiles.
+Subject: [PATCH] Introduced the QT.<module>.plugins variable to module
+ profiles.
 
 ---
  qt3support/modules/qt_qt3support.pri               |    1 +
@@ -939,7 +940,7 @@ index 07f8d88..a7b8ca5 100644
  SOURCES = main.cpp qvncintegration.cpp
  HEADERS = qvncintegration.h
 diff --git a/qtbase/src/plugins/platforms/wayland/wayland.pro b/qtbase/src/plugins/platforms/wayland/wayland.pro
-index face860..92350c0 100644
+index 5945438..6ca5a53 100644
 --- a/qtbase/src/plugins/platforms/wayland/wayland.pro
 +++ b/qtbase/src/plugins/platforms/wayland/wayland.pro
 @@ -1,7 +1,7 @@
@@ -952,7 +953,7 @@ index face860..92350c0 100644
  DEFINES += Q_PLATFORM_WAYLAND
  DEFINES += $$QMAKE_DEFINES_WAYLAND
 diff --git a/qtbase/src/plugins/platforms/xlib/xlib.pro b/qtbase/src/plugins/platforms/xlib/xlib.pro
-index 159fdbe..22b27d8 100644
+index ea77a29..ae02077 100644
 --- a/qtbase/src/plugins/platforms/xlib/xlib.pro
 +++ b/qtbase/src/plugins/platforms/xlib/xlib.pro
 @@ -1,7 +1,7 @@
@@ -1224,5 +1225,5 @@ index 3f37d50..3c15c46 100644
  QT.xmlpatterns.depends = core network
  QT.xmlpatterns.DEFINES = QT_XMLPATTERNS_LIB
 -- 
-1.7.3.2.343.g7d43d
+1.7.5.rc2.4.g4d8b3
 
diff --git a/patches/0100-Modularized-tst_bic-and-add-some-helper-functions-fo.patch b/patches/0100-Modularized-tst_bic-and-add-some-helper-functions-fo.patch
index 6268241..f6c9761 100644
--- a/patches/0100-Modularized-tst_bic-and-add-some-helper-functions-fo.patch
+++ b/patches/0100-Modularized-tst_bic-and-add-some-helper-functions-fo.patch
@@ -1,7 +1,8 @@
-From f30296db1bc665ac7e77ce1c3feb245a16b0d5f1 Mon Sep 17 00:00:00 2001
+From e44875d469b9d4976a59e6ce9fccb57b913a8411 Mon Sep 17 00:00:00 2001
 From: Liang Qi <liang.qi@nokia.com>
 Date: Tue, 22 Mar 2011 16:13:21 +0100
-Subject: [PATCH] Modularized tst_bic and add some helper functions for global test
+Subject: [PATCH] Modularized tst_bic and add some helper functions for global
+ test
 
 ---
  qt3support/tests/global/global.cfg    |    5 +
@@ -450,5 +451,5 @@ index 0000000..fb1042d
 +</modules>
 +</config>
 -- 
-1.7.3.2.343.g7d43d
+1.7.5.rc2.4.g4d8b3
 
diff --git a/patches/0103-Modularized-tst_symbols.patch b/patches/0103-Modularized-tst_symbols.patch
index 6b0984b..fa13d33 100644
--- a/patches/0103-Modularized-tst_symbols.patch
+++ b/patches/0103-Modularized-tst_symbols.patch
@@ -1,4 +1,4 @@
-From ac642db61e92e79918ebe59d0eceb30c5e11a10c Mon Sep 17 00:00:00 2001
+From 4251a251f1e704420c47249519e5ab1666ffbf20 Mon Sep 17 00:00:00 2001
 From: Liang Qi <liang.qi@nokia.com>
 Date: Tue, 22 Mar 2011 20:04:58 +0100
 Subject: [PATCH] Modularized tst_symbols
@@ -21,7 +21,7 @@ index 2b772f4..370aee5 100644
  QT = core
  
 diff --git a/qtqa/tests/auto/symbols/tst_symbols.cpp b/qtqa/tests/auto/symbols/tst_symbols.cpp
-index db1cbea..d1f7a6b 100644
+index 6f21c71..ff5d3a3 100644
 --- a/qtqa/tests/auto/symbols/tst_symbols.cpp
 +++ b/qtqa/tests/auto/symbols/tst_symbols.cpp
 @@ -43,6 +43,8 @@
@@ -103,7 +103,7 @@ index db1cbea..d1f7a6b 100644
          QProcess proc;
          proc.start("nm",
             QStringList() << "-C" << "--format=posix"
-@@ -292,17 +333,23 @@ void tst_Symbols::prefix()
+@@ -288,17 +329,23 @@ void tst_Symbols::prefix()
      excusedPrefixes["phonon"] =
          QStringList() << ns + "Phonon";
  
@@ -129,5 +129,5 @@ index db1cbea..d1f7a6b 100644
          proc.start("nm",
             QStringList() << "-g" << "-C" << "-D" << "--format=posix"
 -- 
-1.7.4.1.48.g5673d
+1.7.5.rc2.4.g4d8b3
 
diff --git a/patches/0110-Switched-to-more-explicit-signal-slot-definitions-Q_.patch b/patches/0110-Switched-to-more-explicit-signal-slot-definitions-Q_.patch
index d3411ef..58823cc 100644
--- a/patches/0110-Switched-to-more-explicit-signal-slot-definitions-Q_.patch
+++ b/patches/0110-Switched-to-more-explicit-signal-slot-definitions-Q_.patch
@@ -1,7 +1,8 @@
-From 8d00beb1ef8b0710366769beb92bedf9331ecb96 Mon Sep 17 00:00:00 2001
+From dc82cb52f2512120a98ba775a0b4b300f28372cd Mon Sep 17 00:00:00 2001
 From: axis <qt-info@nokia.com>
 Date: Fri, 1 Apr 2011 11:21:36 +0200
-Subject: [PATCH] Switched to more explicit signal/slot definitions (Q_SIGNALS/SLOTS).
+Subject: [PATCH] Switched to more explicit signal/slot definitions
+ (Q_SIGNALS/SLOTS).
 
 This is required for public headers.
 ---
@@ -115,5 +116,5 @@ index 27949ec..62c885c 100644
          void tick(qint64);
          void seekableChanged(bool);
 -- 
-1.7.3.1.msysgit.0
+1.7.5.rc2.4.g4d8b3