Merge remote branch 'qt/4.7' into lighthouse-4.7

Conflicts:
	src/gui/egl/egl.pri
	src/gui/painting/qwindowsurface_p.h

2373 files changed, 296132 insertions, 165156 deletions

diff --git a/bin/createpackage.pl b/bin/createpackage.pl
index 23fe26d..e844767 100755
--- a/bin/createpackage.pl
+++ b/bin/createpackage.pl
@@ -68,7 +68,7 @@ Convenience script for creating signed packages you can install on your phone.
 
 Usage: createpackage.pl [options] templatepkg [target]-[platform] [certificate key [passphrase]]
 
-Where supported optiobns are as follows:
+Where supported options are as follows:
      [-i|install]            = Install the package right away using PC suite
      [-p|preprocess]         = Only preprocess the template .pkg file.
      [-c|certfile=<file>]    = The file containing certificate information for signing.
diff --git a/bin/syncqt b/bin/syncqt
index 71f2eab..e36eeb6 100755
--- a/bin/syncqt
+++ b/bin/syncqt
@@ -50,7 +50,8 @@ my %modules = ( # path to module name map
         "QtDBus" => "$basedir/src/dbus",
         "QtWebKit" => "$basedir/src/3rdparty/webkit/WebCore",
         "phonon" => "$basedir/src/phonon",
-        "QtMultimedia" => "$basedir/src/multimedia",
+        "QtMultimedia" => "$basedir/src/multimedia/multimedia",
+        "QtMediaServices" => "$basedir/src/multimedia/mediaservices",
 );
 my %moduleheaders = ( # restrict the module headers to those found in relative path
         "QtWebKit" => "../WebKit/qt/Api",
diff --git a/configure b/configure
index 600222b..69df540 100755
--- a/configure
+++ b/configure