From 6efabf6dfe7a83ab57ee587fe504b5033359653f Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 13 Feb 2016 01:42:41 +0200 Subject: Updated submodules. Change-Id: I444b4f3ddbb851d94abda55e2e2dfcfee3921d94 Reviewed-by: Frederik Gladhorn --- qtcanvas3d | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtserialport | 2 +- qtwebengine | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qtcanvas3d b/qtcanvas3d index f669d170..5a17c4ca 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit f669d1708c1009adc7d82d42bf550e0d971e827f +Subproject commit 5a17c4ca0552c9f4e6b5646f0cee2b21a55c3d18 diff --git a/qtdoc b/qtdoc index 2479b039..05135158 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 2479b039d195477fa2e24fde44ab1ff4a9758330 +Subproject commit 051351581f29bc375aeb8d51bc624b21a39b59d9 diff --git a/qtlocation b/qtlocation index a2b6581e..526f4593 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit a2b6581e5a865ec1a3a7006b668e36c64d2f7ef5 +Subproject commit 526f459330d9bb5238479523f45aaa4caa958f77 diff --git a/qtserialport b/qtserialport index 6dda140a..6ba354a0 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 6dda140ada3d7c683537b069bf1512275a190884 +Subproject commit 6ba354a0ec3bd3064d072cf170fe9f60f9ae3389 diff --git a/qtwebengine b/qtwebengine index 87cc80fd..f3330812 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 87cc80fd8182b24ff42f0f5458cb82f139730536 +Subproject commit f3330812f8b15dabd5628ac9e40178f20180d8cf -- cgit v1.2.3 From 6bdec75429ee51b5de708751d86162d451e4ca53 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 16 Feb 2016 11:15:41 +0200 Subject: Updated submodules. Change-Id: I6ad2f0dfbfb78f8f4d9c20f81a84803472a4b31c Reviewed-by: Jani Heikkinen --- qtbase | 2 +- qtdoc | 2 +- qtmultimedia | 2 +- qtrepotools | 2 +- qtserialbus | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qtbase b/qtbase index 8c2b4266..e7bf0edf 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 8c2b4266002736da499d169a0da187e5cdc5381a +Subproject commit e7bf0edfd49de9a4d8285fbe8d878f8fda910e6d diff --git a/qtdoc b/qtdoc index 05135158..ff2ff1e3 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 051351581f29bc375aeb8d51bc624b21a39b59d9 +Subproject commit ff2ff1e321066504a67b02990ee9b4e8ad545e3b diff --git a/qtmultimedia b/qtmultimedia index d633c02c..241444ea 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit d633c02ce21b4b5aa9d9877c9424fcc0f363aa6b +Subproject commit 241444eab724ba0cb4fa142c5ccb02243b6f2dc2 diff --git a/qtrepotools b/qtrepotools index bbd7a798..ae405002 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit bbd7a798279cf60376e94c82fc900495e764a068 +Subproject commit ae40500269059a24caaf390ebbc45de458960657 diff --git a/qtserialbus b/qtserialbus index e2c26722..c3f26350 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit e2c26722fad7ce4b034682ca697abfe4743ef19a +Subproject commit c3f263509b64814ba12dbb627897de00b05230bc diff --git a/qtwebengine b/qtwebengine index f3330812..bc2b0d81 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit f3330812f8b15dabd5628ac9e40178f20180d8cf +Subproject commit bc2b0d81a8eff28852c9916a4768f05638d5d4cd diff --git a/qtwebsockets b/qtwebsockets index 469f7485..88946bbe 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 469f748515b65cd4c9bec8794ec37ca6cf5df026 +Subproject commit 88946bbe209cb6148b4a3284077bb9a06c7bc1ef -- cgit v1.2.3 From fb1345171a581298d5913e049f828ea20a8fe13f Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 18 Feb 2016 17:02:57 +0200 Subject: Updated submodules. Change-Id: Ife7e51372a57f53efefc1fe0c8c805442908d8d9 Reviewed-by: Jani Heikkinen --- qtbase | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtbase b/qtbase index e7bf0edf..719623a1 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit e7bf0edfd49de9a4d8285fbe8d878f8fda910e6d +Subproject commit 719623a11d57da6a56d069a5ca8161531a37776b diff --git a/qtsensors b/qtsensors index ad52d307..7197e7f4 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit ad52d307cbff44b77bf7d4fa923377b72bb04374 +Subproject commit 7197e7f4b385315cb241043495cbfad58deb911a diff --git a/qtserialbus b/qtserialbus index c3f26350..eded6c6c 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit c3f263509b64814ba12dbb627897de00b05230bc +Subproject commit eded6c6c20075628d526541dae94356d3d51965d diff --git a/qtserialport b/qtserialport index 6ba354a0..03d492e4 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 6ba354a0ec3bd3064d072cf170fe9f60f9ae3389 +Subproject commit 03d492e49e74eefa1c83e37e833d862f4b9f1e45 -- cgit v1.2.3 From e6076450e13a59b639784cbfaa27d306a8b023ae Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 26 Feb 2016 14:55:04 +0200 Subject: Updated submodules. Change-Id: I3459d79f2daa9d681759f0cb7b8c841aeae7179a Reviewed-by: Jani Heikkinen --- qtandroidextras | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgraphicaleffects | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qttools | 2 +- qtwebengine | 2 +- qtwebview | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/qtandroidextras b/qtandroidextras index 3dee82ad..c2ca28ad 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 3dee82ad4b3f5c8976bbc245b9d5753a50a2a1cf +Subproject commit c2ca28adc0e821427072d86cbb4fbc27a39d1302 diff --git a/qtbase b/qtbase index 719623a1..38944d66 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 719623a11d57da6a56d069a5ca8161531a37776b +Subproject commit 38944d662eda76ecc57cb1fd61da42775fa52f6f diff --git a/qtdeclarative b/qtdeclarative index 19dffeed..dc558b69 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 19dffeed2e677cf03b6e122c7a15f355ebe413c8 +Subproject commit dc558b69f083c89aa8c02952e5f167405939a61a diff --git a/qtdoc b/qtdoc index ff2ff1e3..2ed0ac4b 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit ff2ff1e321066504a67b02990ee9b4e8ad545e3b +Subproject commit 2ed0ac4bbb4d3bfe884f946eac89f71c44f3d27d diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 2f0e5e72..4b8e9a34 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 2f0e5e726d76b8ad5a0e9b07aeb57006490e18b4 +Subproject commit 4b8e9a348ca379b203c26ff14dd236267dd60646 diff --git a/qtmultimedia b/qtmultimedia index 241444ea..9985224a 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 241444eab724ba0cb4fa142c5ccb02243b6f2dc2 +Subproject commit 9985224a89b830dc182b428f491b6187d6f0e1ba diff --git a/qtqa b/qtqa index e5bbdb21..66f33fec 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit e5bbdb21629ee613925a90eaceb07207da21e5a3 +Subproject commit 66f33fecc3b4a2896a4f33a3a7f06fb5cdd36dc8 diff --git a/qtquickcontrols b/qtquickcontrols index fc9c57cf..85c2d2cc 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit fc9c57cf8b66bafbcaa6957bb22293047aa3d9df +Subproject commit 85c2d2cce4c7d49bc425ccd0be2bbd9841b7e79b diff --git a/qttools b/qttools index eb59d808..9904992d 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit eb59d8084af321d05b4ebdfb2c1e051dfdca0b62 +Subproject commit 9904992dc4eb9a5958fcfbac238374ff38498143 diff --git a/qtwebengine b/qtwebengine index bc2b0d81..ae99405b 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit bc2b0d81a8eff28852c9916a4768f05638d5d4cd +Subproject commit ae99405b472babf07b21040444efbdee55a387e9 diff --git a/qtwebview b/qtwebview index 134974f6..472d6de6 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 134974f6457c828ebeef2288b57804164cb4e147 +Subproject commit 472d6de6668bb51bebe86b5a5f7d25466f97c3f4 -- cgit v1.2.3 From d74af1270a8f00dece6253483ce44c62f1ace7cb Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 2 Mar 2016 14:30:34 +0100 Subject: Updated submodules. Change-Id: I49c2a3948ba6c7e8a12f1077b96ddbde1453f67e Reviewed-by: Simon Hausmann --- qtbase | 2 +- qtqa | 2 +- qtwebkit | 2 +- qtwebview | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtbase b/qtbase index 38944d66..3bcc3037 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 38944d662eda76ecc57cb1fd61da42775fa52f6f +Subproject commit 3bcc303711ed930a96c98a500e9f0aa5ff403da5 diff --git a/qtqa b/qtqa index 66f33fec..683f523b 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 66f33fecc3b4a2896a4f33a3a7f06fb5cdd36dc8 +Subproject commit 683f523bcc524e6f78e5a3d1d3c15e2d858bac8e diff --git a/qtwebkit b/qtwebkit index be8e169b..81f43efb 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit be8e169ba38c84562194906047d0da04bf3ae91a +Subproject commit 81f43efbb2112b693b21d8f95cd627e9fd1032b9 diff --git a/qtwebview b/qtwebview index 472d6de6..847f8c40 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 472d6de6668bb51bebe86b5a5f7d25466f97c3f4 +Subproject commit 847f8c40c1f124f3021d78644562b359540e26d4 -- cgit v1.2.3 From 5e158312719dc5f0aeae990c52b093eb2915b4be Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 3 Mar 2016 23:37:35 +0200 Subject: Updated submodules. Change-Id: Id993273e16fbbffd43d958419ab103a857fd1346 Reviewed-by: Jani Heikkinen --- qt3d | 2 +- qtbase | 2 +- qtlocation | 2 +- qtrepotools | 2 +- qtserialbus | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qt3d b/qt3d index 190795b1..7a208d76 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 190795b1f884620ba8b31d3998ac97107d4f4eb7 +Subproject commit 7a208d76ed96bb506899becfe680df06f95451c7 diff --git a/qtbase b/qtbase index 3bcc3037..d0cdc7ad 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 3bcc303711ed930a96c98a500e9f0aa5ff403da5 +Subproject commit d0cdc7ad1e2728caf363abf328b2ad81f2ed5a5b diff --git a/qtlocation b/qtlocation index 526f4593..ca4bce55 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 526f459330d9bb5238479523f45aaa4caa958f77 +Subproject commit ca4bce553d03a64fa119650990083267ea9c8d31 diff --git a/qtrepotools b/qtrepotools index ae405002..333ca78f 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit ae40500269059a24caaf390ebbc45de458960657 +Subproject commit 333ca78f192d129e600889dc2b0381cd829b00fb diff --git a/qtserialbus b/qtserialbus index eded6c6c..48f32572 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit eded6c6c20075628d526541dae94356d3d51965d +Subproject commit 48f32572590e45a57573944c0822855819d138df diff --git a/qtwayland b/qtwayland index baec8be7..29b8bd8b 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit baec8be7294a176620253dbbc1b2938cf96c8360 +Subproject commit 29b8bd8b1117589341110502fe516bf22c920747 diff --git a/qtwebengine b/qtwebengine index ae99405b..5c4ae298 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit ae99405b472babf07b21040444efbdee55a387e9 +Subproject commit 5c4ae298b0a3d75c4c5ea8aef0595914ab25607f -- cgit v1.2.3 From 84a1676ed6566d548f2cce35ced9c0524f41c349 Mon Sep 17 00:00:00 2001 From: Iikka Eklund Date: Fri, 4 Mar 2016 10:11:25 +0200 Subject: Update .gitmodules for automated release src package creation Introduce new "deprecated" value for status attribute. We have two flavors of big source packages we need to produce: qt-everywhere-* which needs to include: - essential - addon - preview - deprecated (e.g. qtscript and qtenginio for Qt5.6 release) Installer only specific source package: - essential - addon The rest (deprecated, preview, ...) need to be shown as split src packages in the installer. The above leads to the following changes: qtscript: addon -> deprecated Needs to be part of big src packages but excluded from installer specific big source package. qtenginio: obsolete -> deprecated We can't exclude this module from qt-everywhere src packages. qtwayland: preview -> addon Needs to be part of installer specific big src package and the module status is not preview anymore. Change-Id: I52e10629bf81860f56ebc4ce9d395e0ca54c4264 Reviewed-by: Oswald Buddenhagen Reviewed-by: Simon Hausmann --- .gitmodules | 6 +++--- init-repository | 20 +++++++++++++------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/.gitmodules b/.gitmodules index 6f4cf63c..7b606d91 100644 --- a/.gitmodules +++ b/.gitmodules @@ -28,7 +28,7 @@ path = qtscript url = ../qtscript.git branch = 5.6.0 - status = addon + status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative @@ -144,7 +144,7 @@ path = qtwayland url = ../qtwayland.git branch = 5.6.0 - status = preview + status = addon [submodule "qt3d"] depends = qtdeclarative qtimageformats path = qt3d @@ -219,7 +219,7 @@ path = qtenginio url = ../qtenginio.git branch = 5.6.0 - status = obsolete + status = deprecated [submodule "qtwebsockets"] depends = qtbase recommends = qtdeclarative diff --git a/init-repository b/init-repository index ae3f0495..cf9487a2 100755 --- a/init-repository +++ b/init-repository @@ -72,11 +72,12 @@ Options: 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". + "essential", "addon", "preview", "deprecated", "obsolete", and + "ignore" refer to classes of modules; "default" maps to + "essential,addon,preview,deprecated", 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". --no-update Skip the `git submodule update' command. @@ -237,7 +238,7 @@ sub parse_arguments # 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'} =~ s/\bdefault\b/preview,essential,addon,deprecated/; $self->{'module-subset'} = [ split(/,/, $self->{'module-subset'}) ]; return; @@ -280,7 +281,8 @@ use constant { STS_PREVIEW => 1, STS_ESSENTIAL => 2, STS_ADDON => 3, - STS_OBSOLETE => 4 + STS_DEPRECATED => 4, + STS_OBSOLETE => 5 }; sub git_clone_all_submodules @@ -314,6 +316,8 @@ sub git_clone_all_submodules $subinits{$1} = STS_ESSENTIAL; } elsif ($3 eq "addon") { $subinits{$1} = STS_ADDON; + } elsif ($3 eq "deprecated") { + $subinits{$1} = STS_DEPRECATED; } elsif ($3 eq "obsolete") { $subinits{$1} = STS_OBSOLETE; } elsif ($3 eq "ignore") { @@ -334,6 +338,8 @@ sub git_clone_all_submodules 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 "deprecated") { + map { $include{$_} = 1; } grep { ($subinits{$_} || 0) eq STS_DEPRECATED } keys %subbases; } elsif ($mod eq "obsolete") { map { $include{$_} = 1; } grep { ($subinits{$_} || 0) eq STS_OBSOLETE } keys %subbases; } elsif ($mod =~ s/^-//) { -- cgit v1.2.3