Modularize the qmlteam's qtquick2 branchqtquick2

12 files changed, 72 insertions, 65 deletions

diff --git a/modularize b/modularize
index bd686db..3e3706b 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 = '7ef9f99301a7c71fdb835f9e1f27d3111557aa2e';
+my $good_master_sha1 = '840cde3f4ba2a0582a35b3119a956c52e1ed7864';
 
 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 4810e68..1275348 100644
--- a/patches/0001-Some-changes-for-qtbase.patch
+++ b/patches/0001-Some-changes-for-qtbase.patch
@@ -1,4 +1,4 @@
-From 01ec70f4e071494e1ee9337295b604cda5b02d6c Mon Sep 17 00:00:00 2001
+From 9c5ef7ce3a4bbd07f2f8b47920856cfba5dda912 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 96895ed..8c2c185 100755
+index 95e4e28..a5fd3e1 100755
 --- a/qtbase/configure
 +++ b/qtbase/configure
-@@ -8821,11 +8821,11 @@ EXEC=""
+@@ -8785,11 +8785,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 494ea52..c6819db 100644
+index ab19a04..b74d610 100644
 --- a/qtbase/tools/configure/configureapp.cpp
 +++ b/qtbase/tools/configure/configureapp.cpp
-@@ -3856,7 +3856,7 @@ void Configure::generateMakefiles()
+@@ -3858,7 +3858,7 @@ void Configure::generateMakefiles()
                  }
                  // don't pass -spec - .qmake.cache has it already
                  args << "-r";
diff --git a/patches/0002-qmake-profiles-for-qttools.patch b/patches/0002-qmake-profiles-for-qttools.patch
index 858201d..3112c89 100644
--- a/patches/0002-qmake-profiles-for-qttools.patch
+++ b/patches/0002-qmake-profiles-for-qttools.patch
@@ -1,13 +1,13 @@
-From be1856e436e4c1bd5fc968c073d597d7da3cc1d4 Mon Sep 17 00:00:00 2001
+From 100450475e4c08d1d64f9b95f9ba05f31194ab67 Mon Sep 17 00:00:00 2001
 From: Olivier Goffart <olivier.goffart@nokia.com>
 Date: Fri, 12 Nov 2010 12:48:25 +0100
 Subject: [PATCH] qmake profiles for qttools
 
 ---
  .../lib/fulltextsearch/fulltextsearch.pri          |    2 +-
- qttools/src/{tools.pro => src.pro}                 |    2 --
- 2 files changed, 1 insertions(+), 3 deletions(-)
- rename qttools/src/{tools.pro => src.pro} (89%)
+ qttools/src/{tools.pro => src.pro}                 |    5 -----
+ 2 files changed, 1 insertions(+), 6 deletions(-)
+ rename qttools/src/{tools.pro => src.pro} (85%)
 
 diff --git a/qttools/src/assistant/lib/fulltextsearch/fulltextsearch.pri b/qttools/src/assistant/lib/fulltextsearch/fulltextsearch.pri
 index 134678f..aac2ec6 100644
@@ -23,21 +23,24 @@ index 134678f..aac2ec6 100644
  INCLUDEPATH += . .. \
                 $$CLUCENEDIR \
 diff --git a/qttools/src/tools.pro b/qttools/src/src.pro
-similarity index 89%
+similarity index 85%
 rename from qttools/src/tools.pro
 rename to qttools/src/src.pro
-index f090b86..c6174e4 100644
+index 1466341..c6174e4 100644
 --- a/qttools/src/tools.pro
 +++ b/qttools/src/src.pro
-@@ -23,7 +23,6 @@ TEMPLATE        = subdirs
+@@ -23,10 +23,6 @@ TEMPLATE        = subdirs
          unix:!symbian:!mac:!embedded:!qpa:SUBDIRS += qtconfig
          win32:!wince*:SUBDIRS += activeqt
      }
--    contains(QT_CONFIG, declarative):SUBDIRS += qml
+-    contains(QT_CONFIG, declarative) {
+-        SUBDIRS += qml qmlscene
+-        !symbian: SUBDIRS += qmlplugindump
+-    }
  }
  
  !wince*:!symbian:SUBDIRS += linguist
-@@ -36,7 +35,6 @@ embedded:SUBDIRS += kmap2qmap
+@@ -39,7 +35,6 @@ embedded:SUBDIRS += kmap2qmap
  
  contains(QT_CONFIG, dbus):SUBDIRS += qdbus
  # We don't need these command line utilities on embedded platforms.
@@ -46,5 +49,5 @@ index f090b86..c6174e4 100644
  
  !wince*:!cross_compile:SUBDIRS += qdoc3
 -- 
-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 102d19c..1bccbb3 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 d35548631229f954fc44b757dc21922ec47ea919 Mon Sep 17 00:00:00 2001
+From 97b39621db5e79a1bd2300f61f93a7ff94fbf054 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 8c2c185..66464fa 100755
+index a5fd3e1..bfcec93 100755
 --- a/qtbase/configure
 +++ b/qtbase/configure
-@@ -8300,10 +8300,10 @@ else
+@@ -8265,10 +8265,10 @@ else
          ln -s "$outpath/src/corelib/global/qconfig.h" "$conf"
      done
  fi
@@ -27,7 +27,7 @@ index 8c2c185..66464fa 100755
  QTCONFIG="$outpath/mkspecs/qconfig.pri"
  QTCONFIG_CONFIG="$QTCONFIG_CONFIG no_mocdepend"
  [ -f "$QTCONFIG.tmp" ] && rm -f "$QTCONFIG.tmp"
-@@ -8403,23 +8403,19 @@ else
+@@ -8368,23 +8368,19 @@ else
  fi
  
  #-------------------------------------------------------------------------------
@@ -55,7 +55,7 @@ index 8c2c185..66464fa 100755
  QMAKE_RCC        = \$\$QT_BUILD_TREE/bin/rcc
  QMAKE_QDBUSXML2CPP = \$\$QT_BUILD_TREE/bin/qdbusxml2cpp
  QMAKE_INCDIR_QT  = \$\$QT_BUILD_TREE/include
-@@ -8429,65 +8425,86 @@ EOF
+@@ -8394,65 +8390,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 c6819db..46f1a87 100644
+index b74d610..5ec4cd6 100644
 --- a/qtbase/tools/configure/configureapp.cpp
 +++ b/qtbase/tools/configure/configureapp.cpp
-@@ -2911,63 +2911,101 @@ void Configure::generateCachefile()
+@@ -2913,63 +2913,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 c6819db..46f1a87 100644
          configStream << "CONFIG+= ";
          configStream << dictionary[ "BUILD" ];
          if (dictionary[ "SHARED" ] == "yes")
-@@ -3027,26 +3065,6 @@ void Configure::generateCachefile()
+@@ -3029,26 +3067,6 @@ void Configure::generateCachefile()
                       << "QT_MINOR_VERSION = " << dictionary["VERSION_MINOR"] << endl
                       << "QT_PATCH_VERSION = " << dictionary["VERSION_PATCH"] << endl;
  
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 f3ab87b..f96509c 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 be0dd0f2149064e9655edaa5d7c24bef3e034dd5 Mon Sep 17 00:00:00 2001
+From ccbc39e9a5f5360f67569d975aba5acda2b1e061 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 66464fa..fe9e311 100755
+index bfcec93..57fe810 100755
 --- a/qtbase/configure
 +++ b/qtbase/configure
-@@ -2550,8 +2550,7 @@ if [ "$OPT_SHADOW" = "yes" ]; then
+@@ -2542,8 +2542,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 46f1a87..2d84ad5 100644
+index 5ec4cd6..914061e 100644
 --- a/qtbase/tools/configure/configureapp.cpp
 +++ b/qtbase/tools/configure/configureapp.cpp
 @@ -188,9 +188,7 @@ Configure::Configure(int& argc, char** argv)
diff --git a/patches/0015-Make-qt.prf-use-new-qt_module.pri-structure-for-QT-v.patch b/patches/0015-Make-qt.prf-use-new-qt_module.pri-structure-for-QT-v.patch
index aa5864b..10ba116 100644
--- a/patches/0015-Make-qt.prf-use-new-qt_module.pri-structure-for-QT-v.patch
+++ b/patches/0015-Make-qt.prf-use-new-qt_module.pri-structure-for-QT-v.patch
@@ -1,23 +1,26 @@
-From f4e625d840a1d623c4aa12dbf84b444000827bff Mon Sep 17 00:00:00 2001
+From 87ebed4cbc87b24b553ce761363e5efde5c9c98e Mon Sep 17 00:00:00 2001
 From: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
 Date: Wed, 24 Nov 2010 22:20:01 -0600
 Subject: [PATCH] Make qt.prf use new qt_module.pri structure for QT variable
 
 This change requires the new resolve_depends(var, prefix) function in qmake.
 ---
- qtbase/mkspecs/features/qt.prf           |   87 ++++++------------------------
- qtbase/mkspecs/features/qt_functions.prf |   63 +++++++++++++++++++++
+ qtbase/mkspecs/features/qt.prf           |   91 +++++------------------------
+ qtbase/mkspecs/features/qt_functions.prf |   63 ++++++++++++++++++++
  qtbase/src/qbase.pri                     |    4 +-
- 3 files changed, 82 insertions(+), 72 deletions(-)
+ 3 files changed, 82 insertions(+), 76 deletions(-)
 
 diff --git a/qtbase/mkspecs/features/qt.prf b/qtbase/mkspecs/features/qt.prf
-index 191a449..4d8e465 100644
+index e4a5ef7..4d8e465 100644
 --- a/qtbase/mkspecs/features/qt.prf
 +++ b/qtbase/mkspecs/features/qt.prf
-@@ -35,19 +35,6 @@ plugin { #Qt plugins
+@@ -35,23 +35,6 @@ plugin { #Qt plugins
  INCLUDEPATH = $$QMAKE_INCDIR_QT $$INCLUDEPATH #prepending prevents us from picking up "stale" includes
  win32:INCLUDEPATH += $$QMAKE_INCDIR_QT/ActiveQt
  
+-# As declarative now uses OpenGL in the API, force include it to avoid having to update all projects
+-contains(QT, declarative): QT += opengl
+-
 -# As order does matter for static libs, we reorder the QT variable here
 -TMPLIBS = declarative webkit phonon multimedia dbus testlib script scripttools svg qt3support sql xmlpatterns xml egl opengl openvg gui network core meegographicssystemhelper
 -for(QTLIB, $$list($$TMPLIBS)) {
@@ -31,10 +34,11 @@ index 191a449..4d8e465 100644
 -   !contains(TMPLIBS, $$QTLIB):message("Warning: unknown QT: $$QTLIB")
 -}
 -
+-
  QT_PLUGIN_VERIFY = QTPLUGIN DEPLOYMENT_PLUGIN
  for(QT_CURRENT_VERIFY, $$list($$QT_PLUGIN_VERIFY)) {
      for(QTPLUG, $$list($$lower($$unique($$QT_CURRENT_VERIFY)))) {
-@@ -128,69 +115,27 @@ for(QT_CURRENT_VERIFY, $$list($$QT_PLUGIN_VERIFY)) {
+@@ -132,69 +115,27 @@ for(QT_CURRENT_VERIFY, $$list($$QT_PLUGIN_VERIFY)) {
          }
      }
  }
@@ -208,5 +212,5 @@ index ce69757..8b29eae 100644
  isEmpty(QT_ARCH):!isEmpty(ARCH):QT_ARCH=$$ARCH #another compat that will rot for change #215700
  TEMPLATE	= lib
 -- 
-1.7.3.2.343.g7d43d
+1.7.5.rc2.4.g4d8b3
 
diff --git a/patches/0019-Make-declarative-compile.patch b/patches/0019-Make-declarative-compile.patch
index a07086f..f4f196d 100644
--- a/patches/0019-Make-declarative-compile.patch
+++ b/patches/0019-Make-declarative-compile.patch
@@ -1,4 +1,4 @@
-From 631968c32343b2798e8dd97656ee0ecf679c0d0f Mon Sep 17 00:00:00 2001
+From 106a1c137f477e6f977e10f414f59d66fe19b526 Mon Sep 17 00:00:00 2001
 From: Liang Qi <liang.qi@nokia.com>
 Date: Thu, 25 Nov 2010 15:20:01 +0100
 Subject: [PATCH] Make declarative compile.
@@ -29,7 +29,7 @@ index 0000000..5fb8c25
 +QT.declarative.libs = $$QT_MODULE_LIB_BASE
 +QT.declarative.depends = gui script network
 diff --git a/qtdeclarative/src/declarative/declarative.pro b/qtdeclarative/src/declarative/declarative.pro
-index b74b18c..fdbb070 100644
+index 8c59ee6..8a0ae71 100644
 --- a/qtdeclarative/src/declarative/declarative.pro
 +++ b/qtdeclarative/src/declarative/declarative.pro
 @@ -1,3 +1,5 @@
@@ -47,7 +47,7 @@ index b74b18c..fdbb070 100644
  
  #INCLUDEPATH -= $$QMAKE_INCDIR_QT/$$TARGET
  #DESTDIR=.
-@@ -39,5 +41,5 @@ symbian: {
+@@ -41,5 +43,5 @@ symbian: {
  linux-g++-maemo:DEFINES += QDECLARATIVEVIEW_NOBACKGROUND
  
  DEFINES += QT_NO_OPENTYPE
@@ -100,5 +100,5 @@ index 2ed4324..a39e22a 100644
  QT.scripttools.libs = $$QT_MODULE_LIB_BASE
  QT.scripttools.depends = script gui network
 -- 
-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 5c742c2..75b3d4c 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 bd93d44214d9eb7db52798994a4ff61789175d60 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 fe9e311..c92af3f 100755
+index 57fe810..753a8e8 100755
 --- a/qtbase/configure
 +++ b/qtbase/configure
-@@ -6958,12 +6958,13 @@ esac
+@@ -6927,12 +6927,13 @@ esac
  
  # enable Qt 3 support functionality
  if [ "$CFG_QT3SUPPORT" = "yes" ]; then
@@ -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
+@@ -7504,17 +7505,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
+@@ -7540,26 +7543,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
+@@ -7578,11 +7579,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
+@@ -7600,7 +7602,8 @@ if [ "$CFG_DECLARATIVE" = "auto" ]; then
  fi
  
  if [ "$CFG_DECLARATIVE" = "yes" ]; then
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 2f0f726..9b3a802 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 2bcc436c862e706c583a31242f72907188a2a635 Mon Sep 17 00:00:00 2001
+From 50ab638625fbf6d0cf0507876b5093a799b6d4e4 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 2d84ad5..9c2ce2c 100644
+index 914061e..6fe46b2 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 2d84ad5..9c2ce2c 100644
                  syncqt_bat.close();
              }
          }
-@@ -1593,9 +1593,6 @@ void Configure::applySpecSpecifics()
+@@ -1595,9 +1595,6 @@ void Configure::applySpecSpecifics()
          dictionary[ "SQL_SQLITE" ]          = "yes";
          dictionary[ "SQL_SQLITE_LIB" ]      = "system";
  
@@ -34,7 +34,7 @@ index 2d84ad5..9c2ce2c 100644
      } else if (dictionary[ "XQMAKESPEC" ].startsWith("linux")) { //TODO actually wrong.
        //TODO
          dictionary[ "STYLE_WINDOWSXP" ]     = "no";
-@@ -2682,7 +2679,7 @@ void Configure::generateOutputVars()
+@@ -2684,7 +2681,7 @@ void Configure::generateOutputVars()
          qmakeVars += "QT_LFLAGS_SQLITE += " + escapeSeparators(dictionary["QT_LFLAGS_SQLITE"]);
  
      if (dictionary[ "QT3SUPPORT" ] == "yes")
@@ -43,7 +43,7 @@ index 2d84ad5..9c2ce2c 100644
  
      if (dictionary[ "OPENGL" ] == "yes")
          qtConfig += "opengl";
-@@ -2727,51 +2724,52 @@ void Configure::generateOutputVars()
+@@ -2729,51 +2726,52 @@ void Configure::generateOutputVars()
      if (dictionary[ "CETEST" ] == "yes")
          qtConfig += "cetest";
  
@@ -123,7 +123,7 @@ index 2d84ad5..9c2ce2c 100644
  
      if (dictionary["DIRECTWRITE"] == "yes")
          qtConfig += "directwrite";
-@@ -2922,81 +2920,81 @@ void Configure::generateCachefile()
+@@ -2924,81 +2922,81 @@ void Configure::generateCachefile()
      }
  
      // Generate qmodule.pri
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 034c4a4..7b60209 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 2dafeb1c875f81af7815e338a6320c6adb95d2e6 Mon Sep 17 00:00:00 2001
+From d8e1f05a14fb613f842c09538e9fc3cb560d46ba 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 9e2be31..1c4f74b2 100644
+index 595768f..4c41559 100644
 --- a/qtbase/qmake/generators/makefile.cpp
 +++ b/qtbase/qmake/generators/makefile.cpp
-@@ -2569,6 +2569,10 @@ MakefileGenerator::writeSubTargets(QTextStream &t, QList<MakefileGenerator::SubT
+@@ -2567,6 +2567,10 @@ MakefileGenerator::writeSubTargets(QTextStream &t, QList<MakefileGenerator::SubT
                  && project->values(subTarget->name + ".CONFIG").indexOf("no_default_target") != -1) {
                  continue;
              }
diff --git a/patches/0087-Switched-to-using-QT.declaratice.imports-variable.patch b/patches/0087-Switched-to-using-QT.declaratice.imports-variable.patch
index c422e1a..e7a96c1 100644
--- a/patches/0087-Switched-to-using-QT.declaratice.imports-variable.patch
+++ b/patches/0087-Switched-to-using-QT.declaratice.imports-variable.patch
@@ -1,4 +1,4 @@
-From 89d7473e07712219c10bb6891894409caf32c8fa Mon Sep 17 00:00:00 2001
+From cc2aab6cde0872ebb0fbf80117e9d62b3595a117 Mon Sep 17 00:00:00 2001
 From: axis <qt-info@nokia.com>
 Date: Thu, 17 Mar 2011 10:58:42 +0100
 Subject: [PATCH] Switched to using QT.declaratice.imports variable.
@@ -37,12 +37,12 @@ index ad872ba..8ebf9a0 100644
  
  qmldir.files += $$PWD/qmldir
 diff --git a/qtdeclarative/src/imports/particles/particles.pro b/qtdeclarative/src/imports/particles/particles.pro
-index 90b50e4..ba570f7 100644
+index 4627956..c04e640 100644
 --- a/qtdeclarative/src/imports/particles/particles.pro
 +++ b/qtdeclarative/src/imports/particles/particles.pro
-@@ -11,7 +11,7 @@ SOURCES += \
- HEADERS += \
-     qdeclarativeparticles_p.h
+@@ -103,7 +103,7 @@ OTHER_FILES += \
+ RESOURCES += \
+     spriteparticles.qrc
  
 -QTDIR_build:DESTDIR = $$QT_BUILD_TREE/imports/$$TARGETPATH
 +DESTDIR = $$QT.declarative.imports/$$TARGETPATH
@@ -63,5 +63,5 @@ index b0d2181..8647f05 100644
  copy2build.commands = $$QMAKE_COPY ${QMAKE_FILE_IN} ${QMAKE_FILE_OUT}
  copy2build.name = COPY ${QMAKE_FILE_IN}
 -- 
-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 fa13d33..7577278 100644
--- a/patches/0103-Modularized-tst_symbols.patch
+++ b/patches/0103-Modularized-tst_symbols.patch
@@ -1,4 +1,4 @@
-From 4251a251f1e704420c47249519e5ab1666ffbf20 Mon Sep 17 00:00:00 2001
+From 15bdb4546385057d1c060c244a7fa16bd4adc238 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 6f21c71..ff5d3a3 100644
+index db1cbea..8252f13 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 6f21c71..ff5d3a3 100644
          QProcess proc;
          proc.start("nm",
             QStringList() << "-C" << "--format=posix"
-@@ -288,17 +329,23 @@ void tst_Symbols::prefix()
+@@ -292,17 +333,23 @@ void tst_Symbols::prefix()
      excusedPrefixes["phonon"] =
          QStringList() << ns + "Phonon";