Updated submodules.

Change-Id: Ife7e51372a57f53efefc1fe0c8c805442908d8d9
Reviewed-by: Jani Heikkinen <jani.heikkinen@theqtcompany.com>

.gitattributes

@@ -1,7 +1,6 @@
 .tag                    export-subst
 .gitignore              export-ignore
 .gitattributes          export-ignore
-.gitmodules             export-ignore
 .commit-template        export-ignore
 init-repository         export-ignore
 README.git              export-ignore

.gitmodules

@@ -1,192 +1,270 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = 5.6
-	initrepo = true
+	branch = 5.6.0
+	status = essential
 [submodule "qtsvg"]
+	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = 5.6
-	initrepo = true
+	branch = 5.6.0
+	status = addon
 [submodule "qtdeclarative"]
+	depends = qtbase
+	recommends = qtsvg qtxmlpatterns
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = 5.6
-	initrepo = true
+	branch = 5.6.0
+	status = essential
 [submodule "qtactiveqt"]
+	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = 5.6
-	initrepo = true
+	branch = 5.6.0
+	status = addon
 [submodule "qtscript"]
+	depends = qtbase
+	recommends = qttools
 	path = qtscript
 	url = ../qtscript.git
-	branch = 5.6
-	initrepo = true
+	branch = 5.6.0
+	status = addon
 [submodule "qtmultimedia"]
+	depends = qtbase
+	recommends = qtdeclarative
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = 5.6
-	initrepo = true
+	branch = 5.6.0
+	status = essential
 [submodule "qttools"]
+	depends = qtbase
+	recommends = qtdeclarative qtactiveqt qtwebkit
 	path = qttools
 	url = ../qttools.git
-	branch = 5.6
-	initrepo = true
+	branch = 5.6.0
+	status = essential
 [submodule "qtxmlpatterns"]
+	depends = qtbase
 	path = qtxmlpatterns
 	url = ../qtxmlpatterns.git
-	branch = 5.6
-	initrepo = true
+	branch = 5.6.0
+	status = addon
 [submodule "qttranslations"]
+	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = 5.6
-	initrepo = true
+	branch = 5.6.0
+	status = essential
+	priority = 30
 [submodule "qtdoc"]
+	depends = qtdeclarative
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = 5.6
-	initrepo = true
+	branch = 5.6.0
+	status = essential
+	priority = 40
 [submodule "qtrepotools"]
 	path = qtrepotools
 	url = ../qtrepotools.git
 	branch = master
-	initrepo = true
+	status = essential
+	qt = false
 [submodule "qtwebkit"]
+	depends = qtbase
+	recommends = qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel qtxmlpatterns
 	path = qtwebkit
 	url = ../qtwebkit.git
-	branch = 5.6
+	branch = 5.6.0
+	status = obsolete
+	project = WebKit.pro
+	priority = 20
 [submodule "qtwebkit-examples"]
+	depends = qtwebkit qttools
 	path = qtwebkit-examples
 	url = ../qtwebkit-examples.git
-	branch = 5.6
+	branch = 5.6.0
+	status = obsolete
 [submodule "qtqa"]
+	depends = qtbase
 	path = qtqa
 	url = ../qtqa.git
 	branch = master
-	initrepo = true
+	status = essential
+	priority = 50
 [submodule "qtlocation"]
+	depends = qtbase
+	recommends = qtdeclarative qtquickcontrols qtserialport qtsystems
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = 5.6
-	initrepo = true
+	branch = 5.6.0
+	status = addon
 [submodule "qtsensors"]
+	depends = qtbase
+	recommends = qtdeclarative
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = 5.6
-	initrepo = true
+	branch = 5.6.0
+	status = addon
 [submodule "qtsystems"]
+	depends = qtbase
+	recommends = qtdeclarative
 	path = qtsystems
 	url = ../qtsystems.git
 	branch = dev
+	status = ignore
 [submodule "qtfeedback"]
+	depends = qtdeclarative
+	recommends = qtmultimedia
 	path = qtfeedback
 	url = ../qtfeedback.git
 	branch = master
+	status = ignore
 [submodule "qtdocgallery"]
+	depends = qtdeclarative
 	path = qtdocgallery
 	url = ../qtdocgallery.git
 	branch = master
+	status = ignore
 [submodule "qtpim"]
+	depends = qtdeclarative
 	path = qtpim
 	url = ../qtpim.git
 	branch = dev
+	status = ignore
 [submodule "qtconnectivity"]
+	depends = qtbase
+	recommends = qtdeclarative qtandroidextras
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = 5.6
-	initrepo = true
+	branch = 5.6.0
+	status = addon
 [submodule "qtwayland"]
+	depends = qtbase
+	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = 5.6
-	initrepo = true
+	branch = 5.6.0
+	status = preview
 [submodule "qt3d"]
+	depends = qtdeclarative qtimageformats
 	path = qt3d
 	url = ../qt3d.git
-	branch = 5.6
-	initrepo = true
+	branch = 5.6.0
+	status = preview
 [submodule "qtimageformats"]
+	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = 5.6
-	initrepo = true
+	branch = 5.6.0
+	status = addon
 [submodule "qtquick1"]
+	depends = qtscript
+	recommends = qtsvg qtxmlpatterns
 	path = qtquick1
 	url = ../qtquick1.git
-	branch = 5.6
+	branch = 5.6.0
+	status = obsolete
 [submodule "qtgraphicaleffects"]
+	depends = qtdeclarative
 	path = qtgraphicaleffects
 	url = ../qtgraphicaleffects.git
-	branch = 5.6
-	initrepo = true
+	branch = 5.6.0
+	status = addon
 [submodule "qtquickcontrols"]
+	depends = qtdeclarative
+	recommends = qtgraphicaleffects
 	path = qtquickcontrols
 	url = ../qtquickcontrols.git
-	branch = 5.6
-	initrepo = true
+	branch = 5.6.0
+	status = essential
 [submodule "qtserialbus"]
+	depends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
-	branch = 5.6
+	branch = 5.6.0
+	status = preview
 [submodule "qtserialport"]
+	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = 5.6
-	initrepo = true
+	branch = 5.6.0
+	status = addon
 [submodule "qtx11extras"]
+	depends = qtbase
 	path = qtx11extras
 	url = ../qtx11extras.git
-	branch = 5.6
-	initrepo = true
+	branch = 5.6.0
+	status = addon
 [submodule "qtmacextras"]
+	depends = qtbase
 	path = qtmacextras
 	url = ../qtmacextras.git
-	branch = 5.6
-	initrepo = true
+	branch = 5.6.0
+	status = addon
 [submodule "qtwinextras"]
+	depends = qtbase
+	recommends = qtdeclarative qtmultimedia
 	path = qtwinextras
 	url = ../qtwinextras.git
-	branch = 5.6
-	initrepo = true
+	branch = 5.6.0
+	status = addon
 [submodule "qtandroidextras"]
+	depends = qtbase
 	path = qtandroidextras
 	url = ../qtandroidextras.git
-	branch = 5.6
-	initrepo = true
+	branch = 5.6.0
+	status = addon
 [submodule "qtenginio"]
+	depends = qtdeclarative
 	path = qtenginio
 	url = ../qtenginio.git
-	branch = 5.6
-	initrepo = true
+	branch = 5.6.0
+	status = obsolete
 [submodule "qtwebsockets"]
+	depends = qtbase
+	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = 5.6
-	initrepo = true
+	branch = 5.6.0
+	status = addon
 [submodule "qtwebchannel"]
+	depends = qtbase
+	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = 5.6
-	initrepo = true
+	branch = 5.6.0
+	status = addon
 [submodule "qtwebengine"]
+	depends = qtquickcontrols qtwebchannel
+	recommends = qtlocation
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = 5.6
-	initrepo = true
+	branch = 5.6.0
+	status = addon
+	priority = 10
 [submodule "qtcanvas3d"]
+	depends = qtdeclarative
 	path = qtcanvas3d
 	url = ../qtcanvas3d.git
-	branch = 5.6
-	initrepo = true
+	branch = 5.6.0
+	status = addon
 [submodule "qtwebview"]
+	depends = qtdeclarative
+	recommends = qtwebengine
 	path = qtwebview
 	url = ../qtwebview.git
-	branch = 5.6
-	initrepo = true
+	branch = 5.6.0
+	status = addon
 [submodule "qtquickcontrols2"]
+	depends = qtquickcontrols
 	path = qtquickcontrols2
 	url = ../qtquickcontrols2.git
-	branch = 5.6
-	initrepo = true
+	branch = 5.6.0
+	status = preview
+[submodule "qtpurchasing"]
+	depends = qtbase
+	recommends = qtdeclarative
+	path = qtpurchasing
+	url = ../qtpurchasing.git
+	branch = dev
+	status = ignore

README

@@ -39,11 +39,24 @@ 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>/qt-everywhere-opensource-src-<version>
-     ./configure -prefix $PWD/qtbase -opensource -nomake tests
+     cd <path>/<source_package>
+     ./configure -prefix $PWD/qtbase <license> -nomake tests
      make -j 4
 
    Windows:
@@ -55,8 +68,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>\qt-everywhere-opensource-src-<version>
-     configure -prefix %CD%\qtbase -opensource -nomake tests
+     cd <path>\<source_package>
+     configure -prefix %CD%\qtbase <license> -nomake tests
      nmake // jom // mingw32-make
 
      To accelerate the bootstrap of qmake with MSVC, it may be useful to pass
@@ -81,13 +94,13 @@ HOW TO BUILD QT5
  Example for a release build:
  (adjust the `-jN' parameter as appropriate for your system)
 
-   ./configure -prefix $PWD/qtbase -opensource
+   ./configure -prefix $PWD/qtbase <license>
    make -j4
 
  Example for a developer build:
  (enables more autotests, builds debug version of libraries, ...)
 
-   ./configure -developer-build -opensource
+   ./configure -developer-build <license>
    make -j4
 
  See output of `./configure -help' for documentation on various options to
@@ -100,7 +113,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 -opensource
+   ./configure -prefix $PWD/qtbase <license>
    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

@@ -39,148 +39,123 @@ use warnings;
 package Qt::InitRepository;
 
 
-=head1 NAME
+sub printUsage($)
+{
+    my ($ex) = @_;
 
-init-repository - initialize the Qt5 repository and all submodules
+    print <<EOF ;
+Usage:
+      ./init-repository [options]
 
-=head1 SYNOPSIS
+    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.
 
-  ./init-repository [options]
+Options:
+  Global options:
 
-This script may be run after an initial `git clone' of Qt5 in order to check
-out all submodules.
+    --force, -f
+        Force initialization (even if the submodules are already checked
+        out).
 
+    --force-hooks
+        Force initialization of hooks (even if there are already hooks in
+        checked out submodules).
 
-=head1 OPTIONS
+    --quiet, -q
+        Be quiet. Will exit cleanly if the repository is already
+        initialized.
 
-B<Global options:>
+  Module options:
 
-=over
+    --module-subset=<module1>,<module2>...
+        Only initialize the specified subset of modules given as the
+        argument. Specified modules must already exist in .gitmodules. The
+        string "all" results in cloning all known modules. The strings
+        "essential", "addon", "preview", "obsolete", and "ignore" refer to
+        classes of modules; "default" maps to "essential,addon,preview",
+        which corresponds with the set of maintained modules and is also
+        the default set. Module names may be prefixed with a dash to
+        exclude them from a bigger set, e.g. "all,-ignore".
 
-=item --force, -f
+    --no-update
+        Skip the `git submodule update' command.
 
-Force initialization (even if the submodules are already checked out).
+    --branch
+        Instead of checking out specific SHA1s, check out the submodule
+        branches that correspond with the current supermodule commit. By
+        default, this option will cause local commits in the submodules to
+        be rebased. With --no-update, the branches will be checked out, but
+        their heads will not move.
 
+    --ignore-submodules
+        Set git config to ignore submodules by default when doing operations
+        on the qt5 repo, such as `pull', `fetch', `diff' etc.
 
-=item --force-hooks
+        After using this option, pass `--ignore-submodules=none' to git to
+        override it as needed.
 
-Force initialization of hooks (even if there are already hooks in checked out
-submodules).
+  Repository options:
 
+    --berlin
+        Switch to internal URLs and make use of the Berlin git mirrors.
+        (Implies `--mirror').
 
-=item --quiet, -q
+    --oslo
+        Switch to internal URLs and make use of the Oslo git mirrors.
+        (Implies `--mirror').
 
-Be quiet.  Will exit cleanly if the repository is already initialized.
+    --codereview-username <Gerrit/JIRA username>
+        Specify the user name for the (potentially) writable `gerrit' remote
+        for each module, for use with the Gerrit code review tool.
 
-=back
+        If this option is omitted, the gerrit remote is created without a
+        username and port number, and thus relies on a correct SSH
+        configuration.
 
+    --alternates <path to other Qt5 repo>
+        Adds alternates for each submodule to another full qt5 checkout.
+        This makes this qt5 checkout very small, as it will use the object
+        store of the alternates before unique objects are stored in its own
+        object store.
 
-B<Module options:>
+        This option has no effect when using `--no-update'.
 
-=over
+        NOTE: This will make this repo dependent on the alternate, which is
+        potentially dangerous! The dependency can be broken by also using
+        the `--copy-objects' option, or by running "git repack -a" in each
+        submodule, where required. Please read the note about the `--shared'
+        option in the documentation of `git clone' for more information.
 
-=item --module-subset=<module1>,<module2>...
+    --copy-objects
+        When `--alternates' is used, automatically do a "git repack -a" in
+        each submodule after cloning, to ensure that the repositories are
+        independent from the source used as a reference for cloning.
 
-Only initialize the specified subset of modules given as the argument. Specified
-modules must already exist in .gitmodules.
-The string "all" results in cloning all known modules. The default is the set of
-maintained modules.
-Module names may be prefixed with a dash to exclude them from a bigger set.
+        Note that this negates the disk usage benefits gained from the use
+        of `--alternates'.
 
-=item --no-update
+    --mirror <url-base>
+        Uses <url-base> as the base URL for submodule git mirrors.
 
-Skip the `git submodule update' command.
+        For example:
 
-=item --branch
+          --mirror user\@machine:/foo/bar/
 
-Instead of checking out specific SHA1s, check out the submodule branches that
-correspond with the current supermodule commit.
-By default, this option will cause local commits in the submodules to be rebased.
-With --no-update, the branches will be checked out, but their heads will not move.
+        ...will use the following as a mirror for qtbase:
 
-=item --ignore-submodules
+          user\@machine:/foo/bar/qt/qtbase.git
 
-Set git config to ignore submodules by default when doing operations on the
-qt5 repo, such as `pull', `fetch', `diff' etc.
+        The mirror is permitted to contain a subset of the submodules; any
+        missing modules will fall back to the canonical URLs.
 
-After using this option, pass `--ignore-submodules=none' to git to override
-it as needed.
-
-=back
-
-
-B<Repository options:>
-
-=over
-
-=item --berlin
-
-Switch to internal URLs and make use of the Berlin git mirrors.
-(Implies `--mirror').
-
-=item --oslo
-
-Switch to internal URLs and make use of the Oslo git mirrors.
-(Implies `--mirror').
-
-
-=item --codereview-username <Gerrit/JIRA username>
-
-Specify the user name for the (potentially) writable `gerrit' remote
-for each module, for use with the Gerrit code review tool.
-
-If this option is omitted, the gerrit remote is created without a username
-and port number, and thus relies on a correct SSH configuration.
-
-
-=item --alternates <path to other Qt5 repo>
-
-Adds alternates for each submodule to another full qt5 checkout. This makes
-this qt5 checkout very small, as it will use the object store of the
-alternates before unique objects are stored in its own object store.
-
-This option has no effect when using `--no-update'.
-
-B<NOTE:> This will make this repo dependent on the alternate, which is
-potentially dangerous!  The dependency can be broken by also using
-the `--copy-objects' option, or by running C<git repack -a> in each
-submodule, where required.  Please read the note about the `--shared' option
-in the documentation of `git clone' for more information.
-
-
-=item --copy-objects
-
-When `--alternates' is used, automatically do a C<git repack -a> in each
-submodule after cloning, to ensure that the repositories are independent
-from the source used as a reference for cloning.
-
-Note that this negates the disk usage benefits gained from the use of
-`--alternates'.
-
-
-=item --mirror <url-base>
-
-Uses <url-base> as the base URL for submodule git mirrors.
-
-For example:
-
-  --mirror user@machine:/foo/bar/
-
-...will use the following as a mirror for qtbase:
-
-  user@machine:/foo/bar/qt/qtbase.git
-
-The mirror is permitted to contain a subset of the submodules; any
-missing modules will fall back to the canonical URLs.
-
-=back
-
-=cut
+EOF
+    exit($ex);
+}
 
 use Carp         qw( confess             );
 use English      qw( -no_match_vars      );
-use Getopt::Long qw( GetOptionsFromArray );
-use Pod::Usage   qw( pod2usage           );
+use Getopt::Long qw( GetOptions          );
 use Cwd          qw( getcwd              );
 
 my $GERRIT_SSH_BASE
@@ -221,7 +196,7 @@ sub exe
 
 sub parse_arguments
 {
-    my ($self, @args) = @_;
+    my ($self) = @_;
 
     %{$self} = (%{$self},
         'alternates'          => "",
@@ -236,7 +211,7 @@ sub parse_arguments
         'module-subset'       => "default",
     );
 
-    GetOptionsFromArray(\@args,
+    GetOptions(
         'alternates=s'      =>  \$self->{qw{ alternates        }},
         'branch'            =>  \$self->{qw{ branch            }},
         'codereview-username=s' => \$self->{qw{ codereview-username }},
@@ -249,7 +224,7 @@ sub parse_arguments
         'update!'           =>  \$self->{qw{ update            }},
         'module-subset=s'   =>  \$self->{qw{ module-subset     }},
 
-        'help|?'            =>  sub { pod2usage(1);               },
+        'help|?'            =>  sub { printUsage(1);            },
 
         'berlin' => sub {
             $self->{'mirror-url'}        = $BER_MIRROR_URL_BASE;
@@ -257,11 +232,12 @@ sub parse_arguments
         'oslo' => sub {
             $self->{'mirror-url'}        = $OSLO_MIRROR_URL_BASE;
         },
-    ) || pod2usage(2);
+    ) || printUsage(2);
 
     # Replace any double trailing slashes from end of mirror
     $self->{'mirror-url'} =~ s{//+$}{/};
 
+    $self->{'module-subset'} =~ s/\bdefault\b/preview,essential,addon/;
     $self->{'module-subset'} = [ split(/,/, $self->{'module-subset'}) ];
 
     return;
@@ -300,6 +276,13 @@ sub git_submodule_init
     return;
 }
 
+use constant {
+    STS_PREVIEW => 1,
+    STS_ESSENTIAL => 2,
+    STS_ADDON => 3,
+    STS_OBSOLETE => 4
+};
+
 sub git_clone_all_submodules
 {
     my ($self, $my_repo_base, $co_branch, @subset) = @_;
@@ -324,8 +307,20 @@ sub git_clone_all_submodules
             $subbases{$mod} = $base;
         } elsif ($2 eq "update") {
             push @subset, '-'.$1 if ($3 eq 'none');
-        } elsif ($2 eq "initrepo") {
-            $subinits{$1} = ($3 eq "yes" or $3 eq "true");
+        } elsif ($2 eq "status") {
+            if ($3 eq "preview") {
+                $subinits{$1} = STS_PREVIEW;
+            } elsif ($3 eq "essential") {
+                $subinits{$1} = STS_ESSENTIAL;
+            } elsif ($3 eq "addon") {
+                $subinits{$1} = STS_ADDON;
+            } elsif ($3 eq "obsolete") {
+                $subinits{$1} = STS_OBSOLETE;
+            } elsif ($3 eq "ignore") {
+                delete $subinits{$1};
+            } else {
+                die("Invalid subrepo status '$3' for '$1'.\n");
+            }
         }
     }
 
@@ -333,11 +328,21 @@ sub git_clone_all_submodules
     foreach my $mod (@subset) {
         if ($mod eq "all") {
             map { $include{$_} = 1; } keys %subbases;
-        } elsif ($mod eq "default") {
-            map { $include{$_} = 1; } grep { $subinits{$_} } keys %subbases;
+        } elsif ($mod eq "essential") {
+            map { $include{$_} = 1; } grep { ($subinits{$_} || 0) eq STS_ESSENTIAL } keys %subbases;
+        } elsif ($mod eq "addon") {
+            map { $include{$_} = 1; } grep { ($subinits{$_} || 0) eq STS_ADDON } keys %subbases;
+        } elsif ($mod eq "preview") {
+            map { $include{$_} = 1; } grep { ($subinits{$_} || 0) eq STS_PREVIEW } keys %subbases;
+        } elsif ($mod eq "obsolete") {
+            map { $include{$_} = 1; } grep { ($subinits{$_} || 0) eq STS_OBSOLETE } keys %subbases;
         } elsif ($mod =~ s/^-//) {
+            print "Warning: excluding non-existent module '$mod'.\n"
+                if (!defined($subdirs{$mod}));
             delete $include{$mod};
         } else {
+            die("Error: module subset names non-existent '$mod'.\n")
+                if (!defined($subdirs{$mod}));
             $include{$mod} = 1;
         }
     }
@@ -562,5 +567,5 @@ sub run
 
 #==============================================================================
 
-Qt::InitRepository->new(@ARGV)->run if (!caller);
+Qt::InitRepository->new()->run if (!caller);
 1;

qt.pro

@@ -7,92 +7,68 @@ CONFIG -= build_pass   # unhack, as it confuses Qt Creator
 
 TEMPLATE      = subdirs
 
-defineReplace(moduleName) {
-    return(module_$$replace(1, -, _))
-}
-
-# Arguments: module name, [mandatory deps], [optional deps], [project file]
-defineTest(addModule) {
-    contains(QT_SKIP_MODULES, $$1): return(false)
-    mod = $$moduleName($$1)
-
-    isEmpty(4) {
-        !exists($$1/$${1}.pro): return(false)
-        $${mod}.subdir = $$1
-        export($${mod}.subdir)
+# Extract submodules from .gitmodules.
+lines = $$cat(.gitmodules, lines)
+for (line, lines) {
+    mod = $$replace(line, "^\\[submodule \"([^\"]+)\"\\]$", \\1)
+    !equals(mod, $$line) {
+        module = $$mod
+        modules += $$mod
     } else {
-        !exists($$1/$${4}): return(false)
-        $${mod}.file = $$1/$$4
+        prop = $$replace(line, "^$$escape_expand(\\t)([^ =]+) *=.*$", \\1)
+        !equals(prop, $$line) {
+            val = $$replace(line, "^[^=]+= *", )
+            module.$${module}.$$prop = $$split(val)
+        } else {
+            error("Malformed line in .gitmodules: $$line")
+        }
+    }
+}
+QMAKE_INTERNAL_INCLUDED_FILES += $$PWD/.gitmodules
+
+modules = $$sort_depends(modules, module., .depends .recommends)
+modules = $$reverse(modules)
+for (mod, modules) {
+    equals(module.$${mod}.qt, false): \
+        next()
+
+    deps = $$eval(module.$${mod}.depends)
+    recs = $$eval(module.$${mod}.recommends)
+    for (d, $$list($$deps $$recs)): \
+        !contains(modules, $$d): \
+            error("'$$mod' depends on undeclared '$$d'.")
+
+    contains(QT_SKIP_MODULES, $$mod): \
+        next()
+    !isEmpty(QT_BUILD_MODULES):!contains(QT_BUILD_MODULES, $$mod): \
+        next()
+
+    project = $$eval(module.$${mod}.project)
+    isEmpty(project) {
+        !exists($$mod/$${mod}.pro): \
+            next()
+        $${mod}.subdir = $$mod
+    } else {
+        !exists($$mod/$$project): \
+            next()
+        $${mod}.file = $$mod/$$project
         $${mod}.makefile = Makefile
-        export($${mod}.file)
-        export($${mod}.makefile)
     }
+    $${mod}.target = module-$$mod
 
-    for(d, 2) {
-        dn = $$moduleName($$d)
-        !contains(SUBDIRS, $$dn): \
-            return(false)
-        $${mod}.depends += $$dn
+    for (d, deps) {
+        !contains(SUBDIRS, $$d) {
+            $${mod}.target =
+            break()
+        }
+        $${mod}.depends += $$d
     }
-    for(d, 3) {
-        dn = $$moduleName($$d)
-        contains(SUBDIRS, $$dn): \
-            $${mod}.depends += $$dn
+    isEmpty($${mod}.target): \
+        next()
+    for (d, recs) {
+        contains(SUBDIRS, $$d): \
+            $${mod}.depends += $$d
     }
-    !isEmpty($${mod}.depends): \
-        export($${mod}.depends)
-
-    $${mod}.target = module-$$1
-    export($${mod}.target)
 
     SUBDIRS += $$mod
-    export(SUBDIRS)
-    return(true)
 }
-
-# only qtbase is required to exist. The others may not - but it is the
-# users responsibility to ensure that all needed dependencies exist, or
-# it may not build.
-
-ANDROID_EXTRAS =
-android: ANDROID_EXTRAS = qtandroidextras
-
-addModule(qtbase)
-addModule(qtwebview, qtdeclarative, qtwebengine)
-addModule(qtandroidextras, qtbase)
-addModule(qtmacextras, qtbase)
-addModule(qtx11extras, qtbase)
-addModule(qtsvg, qtbase)
-addModule(qtxmlpatterns, qtbase)
-addModule(qtdeclarative, qtbase, qtsvg qtxmlpatterns)
-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(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(qtdocgallery, qtdeclarative)
-addModule(qtwayland, qtbase, qtdeclarative)
-addModule(qtserialbus, qtbase)
-addModule(qtserialport, qtbase)
-addModule(qtenginio, qtdeclarative)
-addModule(qtwebengine, qtquickcontrols qtwebchannel, qtlocation)
-addModule(qttranslations, qttools)
-addModule(qtdoc, qtdeclarative)
-addModule(qtqa, qtbase)