From f8ae5ee3b624e65c7bc1fe7c76d0004b5ff9f894 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 16 Dec 2015 09:37:15 +0100 Subject: [PATCH 01/13] Updated submodules. Change-Id: I806a9fb4b31adf8c02e00c2320d53f7d7fe3669e Reviewed-by: Simon Hausmann --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtenginio | 2 +- qtlocation | 2 +- qtquickcontrols2 | 2 +- qttools | 2 +- qtwebengine | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qt3d b/qt3d index dc6e9d02..4125d98d 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit dc6e9d02ac1a9030308f2cdf11f96d4d3612fd6d +Subproject commit 4125d98dfa4abdd6533bb7203b7e36a51dc545aa diff --git a/qtbase b/qtbase index adb914f4..8a401371 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit adb914f4b9b723099824fd51a09a9b30bed4ec6c +Subproject commit 8a401371ea6baeb827c7fa57befd5e183949fca7 diff --git a/qtconnectivity b/qtconnectivity index cd81e43c..e7353ef1 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit cd81e43c26ea998aa009ea452e5723059ded8595 +Subproject commit e7353ef137b6d1a450b9393cb8e83026a24298fb diff --git a/qtdeclarative b/qtdeclarative index 5f96bc07..93de0b0e 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 5f96bc07389382d534934120301c2d1a89d24657 +Subproject commit 93de0b0e3d11d761bcfd94283dc6b5e86c12d87f diff --git a/qtenginio b/qtenginio index d08c5e0f..2a19257a 160000 --- a/qtenginio +++ b/qtenginio @@ -1 +1 @@ -Subproject commit d08c5e0f9a29a09be05d34e6f67afea5cee1fc96 +Subproject commit 2a19257a5eef7a25a05d5cf7ea69ecc4184226f3 diff --git a/qtlocation b/qtlocation index d75c0469..51a775b5 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit d75c0469c05809a4c6ff85a4c78784b397cbfcc0 +Subproject commit 51a775b51b320dd3913f2e6f29ea9360a559e814 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index d4df163a..946e8345 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit d4df163af0609340f8b4c006ee18daaff563053d +Subproject commit 946e834578c6ca0a591324b5d5fd21e291cfca0b diff --git a/qttools b/qttools index 58d1304e..e1efa11d 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 58d1304edb82a0a17ee39d259e56b930ca35ffcc +Subproject commit e1efa11d9d316354031a9d37971826215aebdfc5 diff --git a/qtwebengine b/qtwebengine index d239b603..e094d0e6 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit d239b60313f798cf75a4e34a768d9f4a1fc8f92a +Subproject commit e094d0e630f8c0df8c89746f4690d979a05cd9ff From 90b08b1c6dfe6d31b13d1fe066f1849074ee6cd2 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 17 Dec 2015 07:09:46 +0100 Subject: [PATCH 02/13] Updated submodules. Change-Id: I701ce99cb7eb7fa8daffa67699920f51a7ab2087 Reviewed-by: Simon Hausmann --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtserialport | 2 +- qtwebengine | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qt3d b/qt3d index 4125d98d..0be8ddf4 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 4125d98dfa4abdd6533bb7203b7e36a51dc545aa +Subproject commit 0be8ddf4012cea9e9f4b8918270f494b2c3597a3 diff --git a/qtbase b/qtbase index 8a401371..08ee579c 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 8a401371ea6baeb827c7fa57befd5e183949fca7 +Subproject commit 08ee579cf025ad868bb405835b57d31e512b6fd6 diff --git a/qtdeclarative b/qtdeclarative index 93de0b0e..f89d8294 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 93de0b0e3d11d761bcfd94283dc6b5e86c12d87f +Subproject commit f89d8294f930914a8f7b933719596e2e3ebf1773 diff --git a/qtdoc b/qtdoc index 91ca24d0..3fd05d91 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 91ca24d0484ba1166fbd31e7f444346f65e5637b +Subproject commit 3fd05d917938c92cd1e4b919672b400de93d237f diff --git a/qtlocation b/qtlocation index 51a775b5..270b1edc 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 51a775b51b320dd3913f2e6f29ea9360a559e814 +Subproject commit 270b1edc441564b49084d467c7318294b8823fdc diff --git a/qtquickcontrols b/qtquickcontrols index 80cde7c7..dca70483 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 80cde7c7ca22511494ae6d32b2023fb1e92ede4d +Subproject commit dca7048361d7bae21d5b5d6715c725f1b3d62d1e diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 946e8345..2600bd0e 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 946e834578c6ca0a591324b5d5fd21e291cfca0b +Subproject commit 2600bd0eedeaff3dd7727a57ee6149f5211780b4 diff --git a/qtserialport b/qtserialport index bd3fb6cc..0f4cb2f8 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit bd3fb6cc346b3bdbb7a05131b912d450490fa5c8 +Subproject commit 0f4cb2f83f24c348c46f52245f1684f99b48f941 diff --git a/qtwebengine b/qtwebengine index e094d0e6..cce1c85f 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit e094d0e630f8c0df8c89746f4690d979a05cd9ff +Subproject commit cce1c85f5aa0ab66620337de4d640e654e4279a0 From cda5de797b1e970257115120bfc814b5b3874c15 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 23 Dec 2015 20:58:15 +0100 Subject: [PATCH 03/13] Updated submodules. Change-Id: Icf4a1303edde9048adcb9bb40ced1b503a170f22 Reviewed-by: Simon Hausmann --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtmultimedia | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtrepotools | 2 +- qtsensors | 2 +- qttools | 2 +- qtwebengine | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/qt3d b/qt3d index 0be8ddf4..bff49dc1 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 0be8ddf4012cea9e9f4b8918270f494b2c3597a3 +Subproject commit bff49dc160cda19c81190ec58fbf76f4b1829e07 diff --git a/qtactiveqt b/qtactiveqt index dd0feaa9..1091899a 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit dd0feaa95a4c3e186c18bab16db5552bb8efc2db +Subproject commit 1091899a3e440d1c46716b3a6f6731bff5555dcd diff --git a/qtandroidextras b/qtandroidextras index 8e288bab..3dee82ad 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 8e288bab3779af178284be07f49d93ade6bfba70 +Subproject commit 3dee82ad4b3f5c8976bbc245b9d5753a50a2a1cf diff --git a/qtbase b/qtbase index 08ee579c..27479c13 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 08ee579cf025ad868bb405835b57d31e512b6fd6 +Subproject commit 27479c13237692d91ba385e8eef82221d7de2d19 diff --git a/qtconnectivity b/qtconnectivity index e7353ef1..9d3e7e9c 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit e7353ef137b6d1a450b9393cb8e83026a24298fb +Subproject commit 9d3e7e9c2edb38a6bca9bb6c1cdef02c0a329ec4 diff --git a/qtdeclarative b/qtdeclarative index f89d8294..9c462121 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit f89d8294f930914a8f7b933719596e2e3ebf1773 +Subproject commit 9c4621217f47b8427e284423d4e5c5e4dba00bfc diff --git a/qtmultimedia b/qtmultimedia index 82e13516..315a946e 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 82e135167a5d24f600f006480b78a59511ae5cb3 +Subproject commit 315a946e4088f9b5e8c4aad76fbb155654688172 diff --git a/qtquickcontrols b/qtquickcontrols index dca70483..76e8092c 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit dca7048361d7bae21d5b5d6715c725f1b3d62d1e +Subproject commit 76e8092ca45fbb7118708de42651d9840a58b750 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 2600bd0e..bc889a16 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 2600bd0eedeaff3dd7727a57ee6149f5211780b4 +Subproject commit bc889a1622ffefcb617f0f0f85d1245b1acacec9 diff --git a/qtrepotools b/qtrepotools index 3564f7cb..002ed911 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 3564f7cbbf073db127d843b80944fbdb74f9749e +Subproject commit 002ed911052ecc528bd584c9a94b75090d247e78 diff --git a/qtsensors b/qtsensors index c398c3a9..3b334c8e 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit c398c3a93edfdb3e4f9aa4fda7eb1c981333dd03 +Subproject commit 3b334c8e10628a362f54651884a6552966e74a02 diff --git a/qttools b/qttools index e1efa11d..fe4c8a36 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit e1efa11d9d316354031a9d37971826215aebdfc5 +Subproject commit fe4c8a36bccf83b0026ef000af69cbc41b269386 diff --git a/qtwebengine b/qtwebengine index cce1c85f..e9ed15cf 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit cce1c85f5aa0ab66620337de4d640e654e4279a0 +Subproject commit e9ed15cfb271d42723622ae353304141e0bf2c64 From 43135d6e33875d864cc8d34e5ba51cc02ed33840 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 18 Dec 2015 17:01:12 +0100 Subject: [PATCH 04/13] make qtandroidextras a regular optional dependency of qtconnectivity we want to move to a purely declarative way to declare submodules, so the conditional has to go. instead, use an optional dependency to ensure build order, while the module excludes itself via requires() if its dependency is missing. Change-Id: I615382700ff601c9ab003d131b2cc600441c514c Reviewed-by: Simon Hausmann Reviewed-by: Alex Blasche --- qt.pro | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/qt.pro b/qt.pro index be193c55..5e168fae 100644 --- a/qt.pro +++ b/qt.pro @@ -61,9 +61,6 @@ defineTest(addModule) { # users responsibility to ensure that all needed dependencies exist, or # it may not build. -ANDROID_EXTRAS = -android: ANDROID_EXTRAS = qtandroidextras - addModule(qtbase) addModule(qtandroidextras, qtbase) addModule(qtmacextras, qtbase) @@ -79,7 +76,7 @@ addModule(qtwinextras, qtbase, qtdeclarative qtmultimedia) addModule(qtactiveqt, qtbase) addModule(qtsystems, qtbase, qtdeclarative) addModule(qtsensors, qtbase, qtdeclarative) -addModule(qtconnectivity, qtbase $$ANDROID_EXTRAS, qtdeclarative) +addModule(qtconnectivity, qtbase, qtdeclarative qtandroidextras) addModule(qtfeedback, qtdeclarative, qtmultimedia) addModule(qtpim, qtdeclarative) addModule(qtwebsockets, qtbase, qtdeclarative) From c3e404fffd954050ab30d1da92700dc37e1d2a7b Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 17 Aug 2015 17:03:39 +0200 Subject: [PATCH 05/13] don't use GetOptionsFromArray, to restore msysgit perl compatibility Change-Id: Ic02a5d8b5a8a813a23bed1c0b45bcb8ee47e3edb Reviewed-by: Simon Hausmann --- init-repository | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/init-repository b/init-repository index 91c0519f..4f017318 100755 --- a/init-repository +++ b/init-repository @@ -180,7 +180,7 @@ missing modules will fall back to the canonical URLs. use Carp qw( confess ); use English qw( -no_match_vars ); -use Getopt::Long qw( GetOptionsFromArray ); +use Getopt::Long qw( GetOptions ); use Pod::Usage qw( pod2usage ); use Cwd qw( getcwd ); @@ -222,7 +222,7 @@ sub exe sub parse_arguments { - my ($self, @args) = @_; + my ($self) = @_; %{$self} = (%{$self}, 'alternates' => "", @@ -237,7 +237,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 }}, @@ -563,5 +563,5 @@ sub run #============================================================================== -Qt::InitRepository->new(@ARGV)->run if (!caller); +Qt::InitRepository->new()->run if (!caller); 1; From 2e134da46c317669e226000b14551727bd3477d7 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 17 Aug 2015 17:12:30 +0200 Subject: [PATCH 06/13] don't use POD, to restore msysgit perl compatibility Change-Id: I360a6d5246e33dcf3f72bc83f2790905af8c1463 Reviewed-by: Simon Hausmann --- init-repository | 195 +++++++++++++++++++++--------------------------- 1 file changed, 83 insertions(+), 112 deletions(-) diff --git a/init-repository b/init-repository index 4f017318..f0407f63 100755 --- a/init-repository +++ b/init-repository @@ -39,149 +39,120 @@ use warnings; package Qt::InitRepository; -=head1 NAME +sub printUsage($) +{ + my ($ex) = @_; -init-repository - initialize the Qt5 repository and all submodules + print < + Module options: -=over + --module-subset=,... + 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. -=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 + 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 + 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 + 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=,... + --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 + Uses 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 - -=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 - -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 - -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 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 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 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 - -Uses 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( GetOptions ); -use Pod::Usage qw( pod2usage ); use Cwd qw( getcwd ); my $GERRIT_SSH_BASE @@ -250,7 +221,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; @@ -258,7 +229,7 @@ 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{//+$}{/}; From bcebc106f1751cca3e317013b4b15de54d3986d5 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 4 Jan 2016 15:06:46 +0200 Subject: [PATCH 07/13] Updated submodules. Change-Id: Ibacf35a5fb113f9b54a96c10d52aa70e2e64f8da Reviewed-by: Jani Heikkinen --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtserialport | 2 +- qtwebview | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qt3d b/qt3d index bff49dc1..ab5dcff4 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit bff49dc160cda19c81190ec58fbf76f4b1829e07 +Subproject commit ab5dcff44a80884834c5e480e59a2424003c39f1 diff --git a/qtbase b/qtbase index 27479c13..3880f41e 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 27479c13237692d91ba385e8eef82221d7de2d19 +Subproject commit 3880f41e683f02b905c8cbc3c578c3f3a0a1eb2e diff --git a/qtdeclarative b/qtdeclarative index 9c462121..a4b2fa94 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 9c4621217f47b8427e284423d4e5c5e4dba00bfc +Subproject commit a4b2fa94d28327b83c8a1ddce5741c29cb0a7e0c diff --git a/qtdoc b/qtdoc index 3fd05d91..27dc631a 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 3fd05d917938c92cd1e4b919672b400de93d237f +Subproject commit 27dc631a58a456afe86b3553a81f4f2dea75e588 diff --git a/qtlocation b/qtlocation index 270b1edc..cf6bf74b 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 270b1edc441564b49084d467c7318294b8823fdc +Subproject commit cf6bf74b900db1efd2f2c6d51313505fade267ee diff --git a/qtquickcontrols b/qtquickcontrols index 76e8092c..5a992a14 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 76e8092ca45fbb7118708de42651d9840a58b750 +Subproject commit 5a992a14da4334364d81ad8d9e0b270ad0bb370d diff --git a/qtquickcontrols2 b/qtquickcontrols2 index bc889a16..4024fab4 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit bc889a1622ffefcb617f0f0f85d1245b1acacec9 +Subproject commit 4024fab4cbfe5576429c20d1910306d392accf2b diff --git a/qtserialport b/qtserialport index 0f4cb2f8..afe2f238 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 0f4cb2f83f24c348c46f52245f1684f99b48f941 +Subproject commit afe2f2386ecfdc3d0d3fe46f7d1662ab0b6851ce diff --git a/qtwebview b/qtwebview index 7b6d9a4c..5324398a 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 7b6d9a4cba8a4470ee346de40f6f4855fc2b2854 +Subproject commit 5324398a688cd151b9532f5268a7d768a0ec7aee From 63d305bb7de5d8c3aebb2c9d06b6fc5084fe8063 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 11 Jan 2016 20:44:09 +0100 Subject: [PATCH 08/13] Updated submodules. Change-Id: Iff91870d954d24d2649334d2eeb8357e483009b3 Reviewed-by: Simon Hausmann Reviewed-by: Jani Heikkinen --- qt3d | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgraphicaleffects | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtsensors | 2 +- qtserialport | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/qt3d b/qt3d index ab5dcff4..22bbcd9f 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit ab5dcff44a80884834c5e480e59a2424003c39f1 +Subproject commit 22bbcd9fe12eb3e261086045033ab3bee9183b34 diff --git a/qtactiveqt b/qtactiveqt index 1091899a..a89d18b1 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 1091899a3e440d1c46716b3a6f6731bff5555dcd +Subproject commit a89d18b1bc455f99b01594967843aaadd07e4556 diff --git a/qtbase b/qtbase index 3880f41e..03553453 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 3880f41e683f02b905c8cbc3c578c3f3a0a1eb2e +Subproject commit 0355345398ab1bfc46d56ebab7afbb91afc74ee4 diff --git a/qtcanvas3d b/qtcanvas3d index bb1504c2..f7be841e 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit bb1504c271e18a26ad6ac20d55485c167671b1c2 +Subproject commit f7be841e43dde6af1194c370c6a50b0167dd89f4 diff --git a/qtconnectivity b/qtconnectivity index 9d3e7e9c..6b3ef058 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 9d3e7e9c2edb38a6bca9bb6c1cdef02c0a329ec4 +Subproject commit 6b3ef058614fe07942a3506fd4191d12b3659fe9 diff --git a/qtdeclarative b/qtdeclarative index a4b2fa94..8b468ee6 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit a4b2fa94d28327b83c8a1ddce5741c29cb0a7e0c +Subproject commit 8b468ee661007ad56bd867135463c9e0589f7470 diff --git a/qtdoc b/qtdoc index 27dc631a..b699ccaa 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 27dc631a58a456afe86b3553a81f4f2dea75e588 +Subproject commit b699ccaa94f0372b7a74ba2875aae48958744cf8 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 3f240169..2f0e5e72 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 3f240169388d2f3090cd5730e03df8d8ab670510 +Subproject commit 2f0e5e726d76b8ad5a0e9b07aeb57006490e18b4 diff --git a/qtlocation b/qtlocation index cf6bf74b..a41bd807 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit cf6bf74b900db1efd2f2c6d51313505fade267ee +Subproject commit a41bd80784a01050dfb6b888cd90505259471f4f diff --git a/qtmultimedia b/qtmultimedia index 315a946e..c5f5c7a5 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 315a946e4088f9b5e8c4aad76fbb155654688172 +Subproject commit c5f5c7a5f24da3b81f6ac76c3cfcbdfce920df94 diff --git a/qtqa b/qtqa index 0ff6cfc3..dc1439d2 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 0ff6cfc355378efdab53ea54fb493de22f1e950b +Subproject commit dc1439d24d4a0f037b12cce29ef7b9282de07e82 diff --git a/qtquickcontrols b/qtquickcontrols index 5a992a14..73bf08d2 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 5a992a14da4334364d81ad8d9e0b270ad0bb370d +Subproject commit 73bf08d2cdabb8499acf9c63b942f8df8ac0c7c1 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 4024fab4..a3dddf04 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 4024fab4cbfe5576429c20d1910306d392accf2b +Subproject commit a3dddf0471452448003cfe6c6802e3ccaf565b5d diff --git a/qtsensors b/qtsensors index 3b334c8e..e9e4d351 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 3b334c8e10628a362f54651884a6552966e74a02 +Subproject commit e9e4d351df2167a2326608c170131222bef7fff7 diff --git a/qtserialport b/qtserialport index afe2f238..6dda140a 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit afe2f2386ecfdc3d0d3fe46f7d1662ab0b6851ce +Subproject commit 6dda140ada3d7c683537b069bf1512275a190884 diff --git a/qttools b/qttools index fe4c8a36..f0644bd7 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit fe4c8a36bccf83b0026ef000af69cbc41b269386 +Subproject commit f0644bd7992da4125bd307ee72d49b40ef589805 diff --git a/qtwayland b/qtwayland index f51de354..baec8be7 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit f51de354b14d5a25d7e32debe0d56b9fbed67a4f +Subproject commit baec8be7294a176620253dbbc1b2938cf96c8360 diff --git a/qtwebchannel b/qtwebchannel index 97577a0f..e82b9c37 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 97577a0f27a1f427948871ae535645a2e0788bf7 +Subproject commit e82b9c37609ab8f686a6dfd312bf0423bb740f35 diff --git a/qtwebengine b/qtwebengine index e9ed15cf..3ccbfd5c 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit e9ed15cfb271d42723622ae353304141e0bf2c64 +Subproject commit 3ccbfd5cfb4864903bddac0fb9481d11c42a9f53 From 0e2ec253d852b9f9f5e0803885a3f83e0673a291 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 13 Jan 2016 21:03:22 +0100 Subject: [PATCH 09/13] Updated submodules. Change-Id: I3ce0cb4e9ea44dcd860b48d3a6ecaad0eb31964f Reviewed-by: Simon Hausmann --- qt3d | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtdeclarative | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtrepotools | 2 +- qttools | 2 +- qtwebengine | 2 +- qtwebview | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/qt3d b/qt3d index 22bbcd9f..4a63bba7 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 22bbcd9fe12eb3e261086045033ab3bee9183b34 +Subproject commit 4a63bba7ce76801b8bea1094a7ff16a9f8029b37 diff --git a/qtactiveqt b/qtactiveqt index a89d18b1..9893cff4 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit a89d18b1bc455f99b01594967843aaadd07e4556 +Subproject commit 9893cff4d834c9bef1ecf9b853d261ed144e16dc diff --git a/qtbase b/qtbase index 03553453..b8bee407 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 0355345398ab1bfc46d56ebab7afbb91afc74ee4 +Subproject commit b8bee40726fc93db9a025324712de6fff6a084d5 diff --git a/qtcanvas3d b/qtcanvas3d index f7be841e..05f3a58e 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit f7be841e43dde6af1194c370c6a50b0167dd89f4 +Subproject commit 05f3a58e72f012a15d083f1a05a46709fd7b1b9f diff --git a/qtdeclarative b/qtdeclarative index 8b468ee6..f4fb1ff1 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 8b468ee661007ad56bd867135463c9e0589f7470 +Subproject commit f4fb1ff1883ae6c9bafad41343eae4dd7fd51e55 diff --git a/qtmultimedia b/qtmultimedia index c5f5c7a5..924dc7f4 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit c5f5c7a5f24da3b81f6ac76c3cfcbdfce920df94 +Subproject commit 924dc7f48c7003b46079623738ae531f34aed903 diff --git a/qtqa b/qtqa index dc1439d2..54068e7b 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit dc1439d24d4a0f037b12cce29ef7b9282de07e82 +Subproject commit 54068e7b51c408d371a123a997f15c9a4ffcf724 diff --git a/qtquickcontrols b/qtquickcontrols index 73bf08d2..fb0e8833 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 73bf08d2cdabb8499acf9c63b942f8df8ac0c7c1 +Subproject commit fb0e8833fde306eebc31b78722d8f0178b817eb7 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index a3dddf04..15c9d7d0 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit a3dddf0471452448003cfe6c6802e3ccaf565b5d +Subproject commit 15c9d7d07d0427a2fd41dd31f1ce3b620a9f7364 diff --git a/qtrepotools b/qtrepotools index 002ed911..0b050777 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 002ed911052ecc528bd584c9a94b75090d247e78 +Subproject commit 0b050777c276010eda68ecdbb3cd5024c846225e diff --git a/qttools b/qttools index f0644bd7..1c4ee969 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit f0644bd7992da4125bd307ee72d49b40ef589805 +Subproject commit 1c4ee969c20e4285754f81de13f54f1d0cc2b82c diff --git a/qtwebengine b/qtwebengine index 3ccbfd5c..3c6eb1d5 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 3ccbfd5cfb4864903bddac0fb9481d11c42a9f53 +Subproject commit 3c6eb1d5a1344bd60e9fc812b999695957d7028a diff --git a/qtwebview b/qtwebview index 5324398a..4d195d9b 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 5324398a688cd151b9532f5268a7d768a0ec7aee +Subproject commit 4d195d9b01bfb276e5e49a9cc3a0480936f41e58 From bb9eebce48c7697418780d3383c45c614723cf2d Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 18 Jan 2016 15:00:41 +0100 Subject: [PATCH 10/13] Updated submodules. Change-Id: Ia4dbb4d02b5c32c76cd9cbdc320709af668dc4bc Reviewed-by: Simon Hausmann --- qt3d | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtimageformats | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qttools | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtxmlpatterns | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/qt3d b/qt3d index 4a63bba7..8b820e8f 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 4a63bba7ce76801b8bea1094a7ff16a9f8029b37 +Subproject commit 8b820e8f93c851c08941a4eead519588d2135c3d diff --git a/qtactiveqt b/qtactiveqt index 9893cff4..2af645d0 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 9893cff4d834c9bef1ecf9b853d261ed144e16dc +Subproject commit 2af645d0678afe0fa0ea214d0557c32bfbbdf93b diff --git a/qtbase b/qtbase index b8bee407..bc81a285 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit b8bee40726fc93db9a025324712de6fff6a084d5 +Subproject commit bc81a28554a256563e7df8860d17f10a63e45a2b diff --git a/qtcanvas3d b/qtcanvas3d index 05f3a58e..30ae03d2 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 05f3a58e72f012a15d083f1a05a46709fd7b1b9f +Subproject commit 30ae03d289dd967edfea5e164be677085dc45e84 diff --git a/qtconnectivity b/qtconnectivity index 6b3ef058..46d72709 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 6b3ef058614fe07942a3506fd4191d12b3659fe9 +Subproject commit 46d727097c986e6c359291b9ad08ebe1b1b271f0 diff --git a/qtdeclarative b/qtdeclarative index f4fb1ff1..c1bdf815 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit f4fb1ff1883ae6c9bafad41343eae4dd7fd51e55 +Subproject commit c1bdf815494caafd618e52f3b9ef7558d61b5ec5 diff --git a/qtdoc b/qtdoc index b699ccaa..e5b6397c 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit b699ccaa94f0372b7a74ba2875aae48958744cf8 +Subproject commit e5b6397c4af2189be82b0602059be88381cafffd diff --git a/qtimageformats b/qtimageformats index 6730d70f..d7e294de 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 6730d70f001c9492d32a6a8e95c304a52d7ddc35 +Subproject commit d7e294ded23240d62f662579eeed733e6b981d60 diff --git a/qtmultimedia b/qtmultimedia index 924dc7f4..752c1f00 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 924dc7f48c7003b46079623738ae531f34aed903 +Subproject commit 752c1f0077c5f8361d9a166b8caaf7bff25562c1 diff --git a/qtqa b/qtqa index 54068e7b..de8520af 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 54068e7b51c408d371a123a997f15c9a4ffcf724 +Subproject commit de8520af69fcc9a83d44828b8b01ea7c2cc2ed41 diff --git a/qtquickcontrols b/qtquickcontrols index fb0e8833..2d0018b0 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit fb0e8833fde306eebc31b78722d8f0178b817eb7 +Subproject commit 2d0018b0b5570d1c1edd3919a9befcf34c62b873 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 15c9d7d0..c982851a 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 15c9d7d07d0427a2fd41dd31f1ce3b620a9f7364 +Subproject commit c982851a854c56fb05b2a3602e89508f0846b602 diff --git a/qttools b/qttools index 1c4ee969..05eef60e 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 1c4ee969c20e4285754f81de13f54f1d0cc2b82c +Subproject commit 05eef60ec3758b4c4d9f3c1cac5f31f7c40d0c4b diff --git a/qtwebchannel b/qtwebchannel index e82b9c37..eaebf63c 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit e82b9c37609ab8f686a6dfd312bf0423bb740f35 +Subproject commit eaebf63c17964d449b75b7d2d6af3d0efaee5ed9 diff --git a/qtwebengine b/qtwebengine index 3c6eb1d5..7ae7b589 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 3c6eb1d5a1344bd60e9fc812b999695957d7028a +Subproject commit 7ae7b58955b018aa7294aa07d6ff7754af336f4c diff --git a/qtxmlpatterns b/qtxmlpatterns index 8ba61049..640b381a 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 8ba610490e2d93526c165584e2f52c7ae8e9edc0 +Subproject commit 640b381a2bf72b32e6a98adc366e5f56140a5597 From f47e82703c80504304dd18335d669852e72be09f Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 19 Jan 2016 05:36:00 +0100 Subject: [PATCH 11/13] Updated submodules. Change-Id: Ie0cf0058a5e8f383be4608a5c094b610b9a575af Reviewed-by: Simon Hausmann --- qtactiveqt | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtmultimedia | 2 +- qtquickcontrols2 | 2 +- qtwebengine | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index 2af645d0..06276f35 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 2af645d0678afe0fa0ea214d0557c32bfbbdf93b +Subproject commit 06276f3532750e1ecc51eac97b732cdd7258057e diff --git a/qtbase b/qtbase index bc81a285..465e93aa 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit bc81a28554a256563e7df8860d17f10a63e45a2b +Subproject commit 465e93aa95d99f799300867b07f81bdd5162c9f1 diff --git a/qtdeclarative b/qtdeclarative index c1bdf815..9000c046 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit c1bdf815494caafd618e52f3b9ef7558d61b5ec5 +Subproject commit 9000c0465020c698e7ecebbe2f326c689f3ec112 diff --git a/qtmultimedia b/qtmultimedia index 752c1f00..c9a841a3 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 752c1f0077c5f8361d9a166b8caaf7bff25562c1 +Subproject commit c9a841a37614cc2b4f70df935fc097d4627f04a3 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index c982851a..47b3a292 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit c982851a854c56fb05b2a3602e89508f0846b602 +Subproject commit 47b3a29210042c22627a04445055bdacf1f9c722 diff --git a/qtwebengine b/qtwebengine index 7ae7b589..cd1697f0 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 7ae7b58955b018aa7294aa07d6ff7754af336f4c +Subproject commit cd1697f022063dafc59fb512b4a469fbe38729cc From 06c3d40cc90ae33a4d06b3dc21b9c0f23ad00c35 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 18 Dec 2015 18:50:54 +0100 Subject: [PATCH 12/13] move module dependencies from qt.pro to .gitmodules this removes the last redundant module list. the module build order which is not determined by dependencies is pretty random now. this is avoided for a few heavy and "less relevant" modules by setting a priority to built them as late as possible. Change-Id: Ie8ef9777d050a4915cd2282dc9ccb48fcdbc02d2 Reviewed-by: Oswald Buddenhagen Reviewed-by: Simon Hausmann --- .gitattributes | 1 - .gitmodules | 65 +++++++++++++++++++++++ qt.pro | 141 ++++++++++++++++++++----------------------------- 3 files changed, 121 insertions(+), 86 deletions(-) diff --git a/.gitattributes b/.gitattributes index df15048e..084cdfd6 100644 --- a/.gitattributes +++ b/.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 diff --git a/.gitmodules b/.gitmodules index 211c331c..49c27df9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,193 +4,258 @@ branch = 5.6 initrepo = true [submodule "qtsvg"] + depends = qtbase path = qtsvg url = ../qtsvg.git branch = 5.6 initrepo = true [submodule "qtdeclarative"] + depends = qtbase + recommends = qtsvg qtxmlpatterns path = qtdeclarative url = ../qtdeclarative.git branch = 5.6 initrepo = true [submodule "qtactiveqt"] + depends = qtbase path = qtactiveqt url = ../qtactiveqt.git branch = 5.6 initrepo = true [submodule "qtscript"] + depends = qtbase + recommends = qttools path = qtscript url = ../qtscript.git branch = 5.6 initrepo = true [submodule "qtmultimedia"] + depends = qtbase + recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git branch = 5.6 initrepo = true [submodule "qttools"] + depends = qtbase + recommends = qtdeclarative qtactiveqt qtwebkit path = qttools url = ../qttools.git branch = 5.6 initrepo = true [submodule "qtxmlpatterns"] + depends = qtbase path = qtxmlpatterns url = ../qtxmlpatterns.git branch = 5.6 initrepo = true [submodule "qttranslations"] + depends = qttools path = qttranslations url = ../qttranslations.git branch = 5.6 initrepo = true + priority = 30 [submodule "qtdoc"] + depends = qtdeclarative path = qtdoc url = ../qtdoc.git branch = 5.6 initrepo = true + priority = 40 [submodule "qtrepotools"] path = qtrepotools url = ../qtrepotools.git branch = master initrepo = true + qt = false [submodule "qtwebkit"] + depends = qtbase + recommends = qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel qtxmlpatterns path = qtwebkit url = ../qtwebkit.git branch = 5.6 + project = WebKit.pro + priority = 20 [submodule "qtwebkit-examples"] + depends = qtwebkit qttools path = qtwebkit-examples url = ../qtwebkit-examples.git branch = 5.6 [submodule "qtqa"] + depends = qtbase path = qtqa url = ../qtqa.git branch = master initrepo = true + priority = 50 [submodule "qtlocation"] + depends = qtbase + recommends = qtdeclarative qtquickcontrols qtserialport qtsystems path = qtlocation url = ../qtlocation.git branch = 5.6 initrepo = true [submodule "qtsensors"] + depends = qtbase + recommends = qtdeclarative path = qtsensors url = ../qtsensors.git branch = 5.6 initrepo = true [submodule "qtsystems"] + depends = qtbase + recommends = qtdeclarative path = qtsystems url = ../qtsystems.git branch = dev [submodule "qtfeedback"] + depends = qtdeclarative + recommends = qtmultimedia path = qtfeedback url = ../qtfeedback.git branch = master [submodule "qtdocgallery"] + depends = qtdeclarative path = qtdocgallery url = ../qtdocgallery.git branch = master [submodule "qtpim"] + depends = qtdeclarative path = qtpim url = ../qtpim.git branch = dev [submodule "qtconnectivity"] + depends = qtbase + recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git branch = 5.6 initrepo = true [submodule "qtwayland"] + depends = qtbase + recommends = qtdeclarative path = qtwayland url = ../qtwayland.git branch = 5.6 initrepo = true [submodule "qt3d"] + depends = qtdeclarative qtimageformats path = qt3d url = ../qt3d.git branch = 5.6 initrepo = true [submodule "qtimageformats"] + depends = qtbase path = qtimageformats url = ../qtimageformats.git branch = 5.6 initrepo = true [submodule "qtquick1"] + depends = qtscript + recommends = qtsvg qtxmlpatterns path = qtquick1 url = ../qtquick1.git branch = 5.6 [submodule "qtgraphicaleffects"] + depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git branch = 5.6 initrepo = true [submodule "qtquickcontrols"] + depends = qtdeclarative + recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git branch = 5.6 initrepo = true [submodule "qtserialbus"] + depends = qtserialport path = qtserialbus url = ../qtserialbus.git branch = 5.6 [submodule "qtserialport"] + depends = qtbase path = qtserialport url = ../qtserialport.git branch = 5.6 initrepo = true [submodule "qtx11extras"] + depends = qtbase path = qtx11extras url = ../qtx11extras.git branch = 5.6 initrepo = true [submodule "qtmacextras"] + depends = qtbase path = qtmacextras url = ../qtmacextras.git branch = 5.6 initrepo = true [submodule "qtwinextras"] + depends = qtbase + recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git branch = 5.6 initrepo = true [submodule "qtandroidextras"] + depends = qtbase path = qtandroidextras url = ../qtandroidextras.git branch = 5.6 initrepo = true [submodule "qtenginio"] + depends = qtdeclarative path = qtenginio url = ../qtenginio.git branch = 5.6 initrepo = true [submodule "qtwebsockets"] + depends = qtbase + recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git branch = 5.6 initrepo = true [submodule "qtwebchannel"] + depends = qtbase + recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git branch = 5.6 initrepo = true [submodule "qtwebengine"] + depends = qtquickcontrols qtwebchannel + recommends = qtlocation path = qtwebengine url = ../qtwebengine.git branch = 5.6 initrepo = true + priority = 10 [submodule "qtcanvas3d"] + depends = qtdeclarative path = qtcanvas3d url = ../qtcanvas3d.git branch = 5.6 initrepo = true [submodule "qtwebview"] + depends = qtdeclarative + recommends = qtwebengine path = qtwebview url = ../qtwebview.git branch = 5.6 initrepo = true [submodule "qtquickcontrols2"] + depends = qtquickcontrols path = qtquickcontrols2 url = ../qtquickcontrols2.git branch = 5.6 initrepo = true [submodule "qtpurchasing"] + depends = qtbase + recommends = qtdeclarative path = qtpurchasing url = ../qtpurchasing.git branch = 5.6 diff --git a/qt.pro b/qt.pro index 5e168fae..f8d3d4d3 100644 --- a/qt.pro +++ b/qt.pro @@ -7,97 +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) { - 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) { - !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. - -addModule(qtbase) -addModule(qtandroidextras, qtbase) -addModule(qtmacextras, qtbase) -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(qtsensors, qtbase, qtdeclarative) -addModule(qtconnectivity, qtbase, qtdeclarative qtandroidextras) -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(qtscript, qtbase, qttools) -addModule(qtquick1, qtscript, qtsvg qtxmlpatterns) -addModule(qtdocgallery, qtdeclarative) -addModule(qtwayland, qtbase, qtdeclarative) -addModule(qtserialbus, qtserialport) -addModule(qtenginio, qtdeclarative) -addModule(qtwebengine, qtquickcontrols qtwebchannel, qtlocation) -addModule(qtwebview, qtdeclarative, qtwebengine) -addModule(qtpurchasing, qtbase, qtdeclarative) -addModule(qttranslations, qttools) -addModule(qtdoc, qtdeclarative) -addModule(qtqa, qtbase) From 273821d69c58f9c32b4e154dd7cebae1bc481877 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 21 Jan 2016 14:34:26 +0100 Subject: [PATCH 13/13] Updated submodules. Change-Id: I2c671f50d878e8ed03418c2a59c8c997ed3bd6f4 Reviewed-by: Simon Hausmann --- qt3d | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtmultimedia | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtsvg | 2 +- qttools | 2 +- qtwebengine | 2 +- qtwebview | 2 +- qtwinextras | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qt3d b/qt3d index 8b820e8f..ba467a2c 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 8b820e8f93c851c08941a4eead519588d2135c3d +Subproject commit ba467a2c4e44df7934792dfacaa8135c77a010c1 diff --git a/qtactiveqt b/qtactiveqt index 06276f35..7a8395dc 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 06276f3532750e1ecc51eac97b732cdd7258057e +Subproject commit 7a8395dc18a14a4ed356bd69ada5fbf9721ba5fe diff --git a/qtbase b/qtbase index 465e93aa..26379d03 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 465e93aa95d99f799300867b07f81bdd5162c9f1 +Subproject commit 26379d0320637b11519a2f161fb458eb9360ed88 diff --git a/qtdeclarative b/qtdeclarative index 9000c046..872a0547 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 9000c0465020c698e7ecebbe2f326c689f3ec112 +Subproject commit 872a05475721ad771bd347d1526035e6e7479d30 diff --git a/qtmultimedia b/qtmultimedia index c9a841a3..02b8c752 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit c9a841a37614cc2b4f70df935fc097d4627f04a3 +Subproject commit 02b8c7527a88d1cfaed296b856fce63fd62a6c9e diff --git a/qtquickcontrols b/qtquickcontrols index 2d0018b0..148faf62 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 2d0018b0b5570d1c1edd3919a9befcf34c62b873 +Subproject commit 148faf6278186986d1ca6afcdea0c361bcbf199e diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 47b3a292..e8837674 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 47b3a29210042c22627a04445055bdacf1f9c722 +Subproject commit e8837674931b7f59c154083614eb182b121767f0 diff --git a/qtsvg b/qtsvg index 84eae855..38777ea7 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 84eae855ee57ab1c37c8a84ad7e7afcd40b919e6 +Subproject commit 38777ea7451d55e9c3d32d88d46063016013f60c diff --git a/qttools b/qttools index 05eef60e..2b8b1192 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 05eef60ec3758b4c4d9f3c1cac5f31f7c40d0c4b +Subproject commit 2b8b119290d7b453cd1c5ef8ee62bf653eaffbb0 diff --git a/qtwebengine b/qtwebengine index cd1697f0..52d9eeab 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit cd1697f022063dafc59fb512b4a469fbe38729cc +Subproject commit 52d9eeab53b5cfd92c15c9a25894991f84cd827e diff --git a/qtwebview b/qtwebview index 4d195d9b..134974f6 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 4d195d9b01bfb276e5e49a9cc3a0480936f41e58 +Subproject commit 134974f6457c828ebeef2288b57804164cb4e147 diff --git a/qtwinextras b/qtwinextras index c49209f2..7167af38 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit c49209f274ca5b487eb4f94400cec5d5567dec60 +Subproject commit 7167af382ff3ada668462ad6e7df7b6643609fc5