Updated submodules.

Change-Id: I99354fcabe423403aee030714db2076833a6d207
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>

.gitmodules

@@ -1,52 +1,52 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = 5.6
+	branch = 5.5
 	initrepo = true
 [submodule "qtsvg"]
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = 5.6
+	branch = 5.5
 	initrepo = true
 [submodule "qtdeclarative"]
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = 5.6
+	branch = 5.5
 	initrepo = true
 [submodule "qtactiveqt"]
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = 5.6
+	branch = 5.5
 	initrepo = true
 [submodule "qtscript"]
 	path = qtscript
 	url = ../qtscript.git
-	branch = 5.6
+	branch = 5.5
 	initrepo = true
 [submodule "qtmultimedia"]
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = 5.6
+	branch = 5.5
 	initrepo = true
 [submodule "qttools"]
 	path = qttools
 	url = ../qttools.git
-	branch = 5.6
+	branch = 5.5
 	initrepo = true
 [submodule "qtxmlpatterns"]
 	path = qtxmlpatterns
 	url = ../qtxmlpatterns.git
-	branch = 5.6
+	branch = 5.5
 	initrepo = true
 [submodule "qttranslations"]
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = 5.6
+	branch = 5.5
 	initrepo = true
 [submodule "qtdoc"]
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = 5.6
+	branch = 5.5
 	initrepo = true
 [submodule "qtrepotools"]
 	path = qtrepotools
@@ -56,11 +56,13 @@
 [submodule "qtwebkit"]
 	path = qtwebkit
 	url = ../qtwebkit.git
-	branch = 5.6
+	branch = 5.5
+	initrepo = true
 [submodule "qtwebkit-examples"]
 	path = qtwebkit-examples
 	url = ../qtwebkit-examples.git
-	branch = 5.6
+	branch = 5.5
+	initrepo = true
 [submodule "qtqa"]
 	path = qtqa
 	url = ../qtqa.git
@@ -69,12 +71,12 @@
 [submodule "qtlocation"]
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = 5.6
+	branch = 5.5
 	initrepo = true
 [submodule "qtsensors"]
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = 5.6
+	branch = 5.5
 	initrepo = true
 [submodule "qtsystems"]
 	path = qtsystems
@@ -95,102 +97,85 @@
 [submodule "qtconnectivity"]
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = 5.6
+	branch = 5.5
 	initrepo = true
 [submodule "qtwayland"]
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = 5.6
+	branch = 5.5
 	initrepo = true
 [submodule "qt3d"]
 	path = qt3d
 	url = ../qt3d.git
-	branch = 5.6
+	branch = 5.5
 	initrepo = true
 [submodule "qtimageformats"]
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = 5.6
+	branch = 5.5
 	initrepo = true
 [submodule "qtquick1"]
 	path = qtquick1
 	url = ../qtquick1.git
-	branch = 5.6
+	branch = 5.5
+	initrepo = true
 [submodule "qtgraphicaleffects"]
 	path = qtgraphicaleffects
 	url = ../qtgraphicaleffects.git
-	branch = 5.6
+	branch = 5.5
 	initrepo = true
 [submodule "qtquickcontrols"]
 	path = qtquickcontrols
 	url = ../qtquickcontrols.git
-	branch = 5.6
+	branch = 5.5
 	initrepo = true
-[submodule "qtserialbus"]
-	path = qtserialbus
-	url = ../qtserialbus.git
-	branch = 5.6
 [submodule "qtserialport"]
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = 5.6
+	branch = 5.5
 	initrepo = true
 [submodule "qtx11extras"]
 	path = qtx11extras
 	url = ../qtx11extras.git
-	branch = 5.6
+	branch = 5.5
 	initrepo = true
 [submodule "qtmacextras"]
 	path = qtmacextras
 	url = ../qtmacextras.git
-	branch = 5.6
+	branch = 5.5
 	initrepo = true
 [submodule "qtwinextras"]
 	path = qtwinextras
 	url = ../qtwinextras.git
-	branch = 5.6
+	branch = 5.5
 	initrepo = true
 [submodule "qtandroidextras"]
 	path = qtandroidextras
 	url = ../qtandroidextras.git
-	branch = 5.6
+	branch = 5.5
 	initrepo = true
 [submodule "qtenginio"]
 	path = qtenginio
 	url = ../qtenginio.git
-	branch = 5.6
+	branch = 1.2
 	initrepo = true
 [submodule "qtwebsockets"]
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = 5.6
+	branch = 5.5
 	initrepo = true
 [submodule "qtwebchannel"]
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = 5.6
+	branch = 5.5
 	initrepo = true
 [submodule "qtwebengine"]
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = 5.6
+	branch = 5.5
 	initrepo = true
 [submodule "qtcanvas3d"]
 	path = qtcanvas3d
 	url = ../qtcanvas3d.git
-	branch = 5.6
+	branch = 5.5
 	initrepo = true
-[submodule "qtwebview"]
-	path = qtwebview
-	url = ../qtwebview.git
-	branch = 5.6
-	initrepo = true
-[submodule "qtquickcontrols2"]
-	path = qtquickcontrols2
-	url = ../qtquickcontrols2.git
-	branch = 5.6
-	initrepo = true
-[submodule "qtpurchasing"]
-	path = qtpurchasing
-	url = ../qtpurchasing.git
-	branch = 5.6

README

@@ -39,24 +39,11 @@ HOW TO BUILD QT5
      The "bin" folder of the ICU installation should be appended to the PATH
      environment variable in order to for the DLLs to be found at run-time.
 
-   Licensing:
-   ----------
-
-    Opensource users:
-
-        <source_package> = qt-everywhere-opensource-src-<version>
-        <license>        = -opensource
-
-    Commercial users:
-
-        <source_package> = qt-everywhere-enterprise-src-<version>
-        <license>        = -commercial
-
    Linux, Mac:
    -----------
 
-     cd <path>/<source_package>
-     ./configure -prefix $PWD/qtbase <license> -nomake tests
+     cd <path>/qt-everywhere-opensource-src-<version>
+     ./configure -prefix $PWD/qtbase -opensource -nomake tests
      make -j 4
 
    Windows:
@@ -68,8 +55,8 @@ HOW TO BUILD QT5
      * Python version 2.7 or later  [http://www.activestate.com/activepython/]
      * Ruby version 1.9.3 or later  [http://rubyinstaller.org/]
 
-     cd <path>\<source_package>
-     configure -prefix %CD%\qtbase <license> -nomake tests
+     cd <path>\qt-everywhere-opensource-src-<version>
+     configure -prefix %CD%\qtbase -opensource -nomake tests
      nmake // jom // mingw32-make
 
      To accelerate the bootstrap of qmake with MSVC, it may be useful to pass
@@ -94,13 +81,13 @@ HOW TO BUILD QT5
  Example for a release build:
  (adjust the `-jN' parameter as appropriate for your system)
 
-   ./configure -prefix $PWD/qtbase <license>
+   ./configure -prefix $PWD/qtbase -opensource
    make -j4
 
  Example for a developer build:
  (enables more autotests, builds debug version of libraries, ...)
 
-   ./configure -developer-build <license>
+   ./configure -developer-build -opensource
    make -j4
 
  See output of `./configure -help' for documentation on various options to
@@ -113,7 +100,7 @@ HOW TO BUILD QT5
  a `make module-<foo>'.  For example, to build only qtscript and qtwebkit,
  and the modules they depend on:
 
-   ./configure -prefix $PWD/qtbase <license>
+   ./configure -prefix $PWD/qtbase -opensource
    make -j4 module-qtscript module-qtwebkit
 
  This can save a lot of time if you are only interested in a subset of Qt5.

init-repository

@@ -48,8 +48,7 @@ init-repository - initialize the Qt5 repository and all submodules
   ./init-repository [options]
 
 This script may be run after an initial `git clone' of Qt5 in order to check
-out all submodules.  It fetches them from canonical URLs inferred from the
-clone's origin.
+out all submodules.
 
 
 =head1 OPTIONS
@@ -80,6 +79,12 @@ B<Module options:>
 
 =over
 
+=item --no-webkit
+
+Skip webkit and webkit examples submodules.
+It may be desirable to skip these modules due to the large size of the webkit
+git repository.
+
 =item --module-subset=<module1>,<module2>...
 
 Only initialize the specified subset of modules given as the argument. Specified
@@ -234,6 +239,7 @@ sub parse_arguments
         'ignore-submodules'   => 0 ,
         'mirror-url'          => "",
         'update'              => 1 ,
+        'webkit'              => 1 ,
         'module-subset'       => "default",
     );
 
@@ -248,6 +254,7 @@ sub parse_arguments
         'mirror=s'          =>  \$self->{qw{ mirror-url        }},
         'quiet'             =>  \$self->{qw{ quiet             }},
         'update!'           =>  \$self->{qw{ update            }},
+        'webkit!'           =>  \$self->{qw{ webkit            }},
         'module-subset=s'   =>  \$self->{qw{ module-subset     }},
 
         'help|?'            =>  sub { pod2usage(1);               },
@@ -264,6 +271,9 @@ sub parse_arguments
     $self->{'mirror-url'} =~ s{//+$}{/};
 
     $self->{'module-subset'} = [ split(/,/, $self->{'module-subset'}) ];
+    if (!$self->{webkit}) {
+        push @{$self->{'module-subset'}}, "-qtwebkit", "-qtwebkit-examples";
+    }
 
     return;
 }
@@ -324,7 +334,7 @@ sub git_clone_all_submodules
             while ($base =~ s,/(?!\.\./)[^/]+/\.\./,/,g) {}
             $subbases{$mod} = $base;
         } elsif ($2 eq "update") {
-            push @subset, '-'.$1 if ($3 eq 'none');
+            push @subset, '-'.$1 if ($3 eq 'ignore');
         } elsif ($2 eq "initrepo") {
             $subinits{$1} = ($3 eq "yes" or $3 eq "true");
         }

qt.pro

@@ -13,14 +13,7 @@ defineReplace(moduleName) {
 
 # Arguments: module name, [mandatory deps], [optional deps], [project file]
 defineTest(addModule) {
-    for(d, $$list($$2 $$3)): \
-        !contains(MODULES, $$d): \
-            error("'$$1' depends on not (yet) declared '$$d'.")
-    MODULES += $$1
-    export(MODULES)
-
     contains(QT_SKIP_MODULES, $$1): return(false)
-    !isEmpty(QT_BUILD_MODULES):!contains(QT_BUILD_MODULES, $$1): return(false)
     mod = $$moduleName($$1)
 
     isEmpty(4) {
@@ -71,36 +64,32 @@ addModule(qtx11extras, qtbase)
 addModule(qtsvg, qtbase)
 addModule(qtxmlpatterns, qtbase)
 addModule(qtdeclarative, qtbase, qtsvg qtxmlpatterns)
-addModule(qtgraphicaleffects, qtdeclarative)
 addModule(qtquickcontrols, qtdeclarative, qtgraphicaleffects)
-addModule(qtquickcontrols2, qtquickcontrols)
 addModule(qtmultimedia, qtbase, qtdeclarative)
 addModule(qtwinextras, qtbase, qtdeclarative qtmultimedia)
 addModule(qtactiveqt, qtbase)
 addModule(qtsystems, qtbase, qtdeclarative)
+addModule(qtlocation, qtbase, qtdeclarative qtquickcontrols qtsystems)
 addModule(qtsensors, qtbase, qtdeclarative)
 addModule(qtconnectivity, qtbase $$ANDROID_EXTRAS, qtdeclarative)
 addModule(qtfeedback, qtdeclarative, qtmultimedia)
 addModule(qtpim, qtdeclarative)
 addModule(qtwebsockets, qtbase, qtdeclarative)
 addModule(qtwebchannel, qtbase, qtdeclarative qtwebsockets)
-addModule(qtserialport, qtbase)
-addModule(qtlocation, qtbase, qtdeclarative qtquickcontrols qtserialport qtsystems)
 addModule(qtwebkit, qtbase, qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel qtxmlpatterns, WebKit.pro)
 addModule(qttools, qtbase, qtdeclarative qtactiveqt qtwebkit)
 addModule(qtwebkit-examples, qtwebkit qttools)
 addModule(qtimageformats, qtbase)
 addModule(qt3d, qtdeclarative qtimageformats)
 addModule(qtcanvas3d, qtdeclarative)
+addModule(qtgraphicaleffects, qtdeclarative)
 addModule(qtscript, qtbase, qttools)
-addModule(qtquick1, qtscript, qtsvg qtxmlpatterns)
+addModule(qtquick1, qtscript, qtsvg qtxmlpatterns qtwebkit)
 addModule(qtdocgallery, qtdeclarative)
 addModule(qtwayland, qtbase, qtdeclarative)
-addModule(qtserialbus, qtserialport)
+addModule(qtserialport, qtbase)
 addModule(qtenginio, qtdeclarative)
-addModule(qtwebengine, qtquickcontrols qtwebchannel, qtlocation)
-addModule(qtwebview, qtdeclarative, qtwebengine)
-addModule(qtpurchasing, qtbase, qtdeclarative)
+addModule(qtwebengine, qtquickcontrols qtwebchannel, qtwebkit qtlocation)
 addModule(qttranslations, qttools)
 addModule(qtdoc, qtdeclarative)
 addModule(qtqa, qtbase)