Compare commits

...

31 Commits

Author SHA1 Message Date
Qt Submodule Update Bot
b021c416b5 Update submodules on '6.0' in qt/qt5
Change-Id: Ifff28ca8c055f02e19818be673b962aca7cdbf3f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-03-26 06:23:45 +02:00
Paul Wicking
55273d6cc0 Update documentation for init-repository
There's no mention of additionalLibrary status.

Change-Id: I3ebf8fdc6dcfc01392b1ab5a42734cef81d6fc61
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
(cherry picked from commit ed139ea47e)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-03-25 18:19:14 +00:00
Qt Submodule Update Bot
7aa86c0924 Update submodules on '6.0' in qt/qt5
Change-Id: Ic13adf9282cea81f8fd00187cf343bf33994243b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-03-24 07:18:34 +02:00
Qt Submodule Update Bot
ea624475d7 Update submodules on '6.0' in qt/qt5
Change-Id: Ie4614881e3b92023f300cf9e82df6661226b93bb
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-03-23 13:29:01 +02:00
Qt Submodule Update Bot
64f08a4607 Update submodules on '6.0' in qt/qt5
Change-Id: I192cca38ff1deb2fec4e7c5112f5f3427a2ffc42
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-03-23 03:01:20 +02:00
Qt Submodule Update Bot
e3ef111eae Update submodules on '6.0' in qt/qt5
Change-Id: Id619a45a77efda40079bd172da5b92cfe24405f1
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-03-22 17:59:38 +02:00
Qt Submodule Update Bot
f97f0edc10 Update submodules on '6.0' in qt/qt5
Change-Id: I6168a62d97c3ae1e2d4d1063e9f77a96e6ca1d9b
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-03-22 07:30:06 +02:00
Qt Submodule Update Bot
9d021a4170 Update submodules on '6.0' in qt/qt5
Change-Id: I0f9ae377b375e01767e0b5db1385d37a2ac7d239
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-03-19 06:32:23 +02:00
Qt Submodule Update Bot
e62979050c Update submodules on '6.0' in qt/qt5
Change-Id: Id8442e10ef72de96201c1a1ff96b94ecf2e81988
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-03-18 11:28:41 +02:00
Qt Submodule Update Bot
282de9a961 Update submodules on '6.0' in qt/qt5
Change-Id: I7d538c58d6b92474c0376b2db670c02c85243705
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-03-18 05:45:12 +02:00
Qt Submodule Update Bot
987453db68 Update submodules on '6.0' in qt/qt5
Change-Id: Ica8e1b80990fc5765d1ab9539b1d2a5ea25780e6
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-03-17 10:24:54 +02:00
Qt Submodule Update Bot
04ff839c76 Update submodules on '6.0' in qt/qt5
Change-Id: I4fdbc53169d9e446f68a9afd01d38c77f7a72178
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-03-17 05:57:56 +02:00
Qt Submodule Update Bot
3bc11ef32e Update submodules on '6.0' in qt/qt5
Change-Id: Ib60b526f1119abddc08db9eacb8a13bc67140aa0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-03-13 03:11:41 +02:00
Qt Submodule Update Bot
a44a53aba2 Update submodules on '6.0' in qt/qt5
Change-Id: I5a0e81d1050911480176ea8c47d89d9f357f25d3
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-03-12 17:10:03 +02:00
Paul Wicking
6797c35157 Fix init-repository
Introducing additionalLibrary to .gitmodules
broke init-repository. Add the new state also
here.

Task-number: QTBUG-90669
Change-Id: I3ac9960427ef2fd8fe39b508b69459f4fcf81ca7
Reviewed-by: Daniel Smith <Daniel.Smith@qt.io>
(cherry picked from commit 414165e366)
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
2021-03-12 09:19:12 +00:00
Qt Submodule Update Bot
9abdbccaf1 Update submodules on '6.0' in qt/qt5
Change-Id: I3c96114fe38788172dec85558f0dca4d02bdeaf9
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-03-12 09:35:33 +02:00
Qt Submodule Update Bot
e29bd4cb85 Update submodules on '6.0' in qt/qt5
Change-Id: I3955d571bdc65cdf25ea8fad436a174e03d9698c
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-03-12 04:41:58 +02:00
Qt Submodule Update Bot
38746546d8 Update submodules on '6.0' in qt/qt5
Change-Id: I847ea44eb219d62db0c9995ce958db63d96caf9f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-03-12 00:07:20 +02:00
Qt Submodule Update Bot
dafc99a0d7 Update submodules on '6.0' in qt/qt5
Change-Id: I52d3d5eadfd70b536395707b274fcb1213d50a03
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-03-11 13:31:43 +02:00
Qt Submodule Update Bot
b40dbab18a Update submodules on '6.0' in qt/qt5
Change-Id: Ic32b021870b95b11e5052f06719fa51682d2e61d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-03-09 14:26:24 +02:00
Qt Submodule Update Bot
6e20e9c2b7 Update submodules on '6.0' in qt/qt5
Change-Id: Ic1753dd735fca577e9eef3259ef86ba34045aac0
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-03-09 07:42:32 +02:00
Qt Submodule Update Bot
b02360baa5 Update submodules on '6.0' in qt/qt5
Change-Id: If8e2dafdbd5dd5f35597c189c0e35dafff17d0ef
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-03-08 09:28:37 +02:00
Jani Heikkinen
42fdb9aa58 Update submodules on '6.0' in qt/qt5
Change-Id: I0ec016b5f2d690f66933d74501f12338287a2f51
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
2021-03-05 06:22:59 +00:00
Qt Submodule Update Bot
b7f2961bb3 Update submodules on '6.0' in qt/qt5
Change-Id: Ife4c80edbf8615591547ccb48a027c272e1eeabf
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-03-04 11:34:44 +02:00
Qt Submodule Update Bot
872dedd971 Update submodules on '6.0' in qt/qt5
Change-Id: I502feee6229dca5c48cd930d954a67a02d1cde8a
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-03-04 05:45:12 +02:00
Qt Submodule Update Bot
2caf6349be Update submodules on '6.0' in qt/qt5
Change-Id: Ie8281ffd56ed6caab105f85afbd0d375db78d28f
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-03-02 09:18:36 +02:00
Qt Submodule Update Bot
2af56dd556 Update submodules on '6.0' in qt/qt5
Change-Id: I8d70b77128db9575d864414f1c9ea3cdb9c24e7d
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-03-01 06:16:50 +02:00
Jani Heikkinen
17abff55d5 Add missing additional libraries in qt5.git
We are now supporting 'status = additionalLibrary' for submodules. So
add missing additional libraries and update statuses accordingly

Change-Id: I4e87b92e15ec54e965af94af5841cd3a8a8278ef
Reviewed-by: Akseli Salovaara <akseli.salovaara@qt.io>
2021-02-26 10:14:09 +02:00
Topi Reinio
e9ecfdb335 init-repository: Fix incorrect use of 'or' operator
This fixes the warning 'Useless use of a constant ("qt5") in void
context at ./init-repository line 649.'

Change-Id: I12133b30b504e536eaf68e4260df5aed28543eb6
Reviewed-by: Edward Welbourne <edward.welbourne@qt.io>
(cherry picked from commit 8ebf0095c3)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
2021-02-25 16:19:28 +00:00
Heikki Halmet
26bffd2fab Provisioning: Remove squish script call under Windows 10 x86
RTA don't use squish with Windows 10 x86 in Qt6

Pick-to: dev
Pick-to: 6.1
Change-Id: Ib1c27e53310506f2c91ab8b65404caba8fcfcaf8
Reviewed-by: Johanna Äijälä <johanna.aijala@qt.io>
Reviewed-by: Tony Sarajärvi <tony.sarajarvi@qt.io>
2021-02-25 14:26:32 +02:00
Qt Submodule Update Bot
2dcb3fea14 Update submodules on '6.0' in qt/qt5
Change-Id: I6b4e6e1895861099c2695f840d5c9d709829a5da
Reviewed-by: Qt Submodule Update Bot <qt_submodule_update_bot@qt-project.org>
2021-02-25 10:28:50 +02:00
23 changed files with 59 additions and 31 deletions

30
.gitmodules vendored
View File

@@ -124,14 +124,14 @@
recommends = qtdeclarative qtshadertools
path = qt3d
url = ../qt3d.git
branch = dev
status = ignore
branch = 6.0
status = additionalLibrary
[submodule "qtimageformats"]
depends = qtbase
path = qtimageformats
url = ../qtimageformats.git
branch = dev
status = ignore
branch = 6.0
status = additionalLibrary
[submodule "qtgraphicaleffects"]
depends = qtdeclarative
path = qtgraphicaleffects
@@ -277,8 +277,8 @@
depends = qtbase
path = qtnetworkauth
url = ../qtnetworkauth.git
branch = dev
status = ignore
branch = 6.0
status = additionalLibrary
[submodule "qtremoteobjects"]
depends = qtbase
recommends = qtdeclarative
@@ -323,3 +323,21 @@
url = ../qt5compat.git
branch = 6.0
status = deprecated
[submodule "qtcoap"]
depends = qtbase qttools
path = qtcoap
url = ../qtcoap.git
branch = 6.0
status = additionalLibrary
[submodule "qtmqtt"]
depends = qtbase qtdeclarative qttools
path = qtmqtt
url = ../qtmqtt.git
branch = 6.0
status = additionalLibrary
[submodule "qtopcua"]
depends = qtbase qtdeclarative qtquickcontrols2 qttools
path = qtopcua
url = ../qtopcua.git
branch = 6.0
status = additionalLibrary

View File

@@ -1 +0,0 @@
. "$PSScriptRoot\..\common\windows\squishInstall.ps1"

View File

@@ -72,11 +72,14 @@ 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", "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
"essential", "addon", "preview", "deprecated", "obsolete",
"additionalLibrary", and "ignore" refer to classes of modules
identified by "status=" lines in the .gitmodules file.
You can use "default" in the subset as a short-hand for
"essential,addon,preview,deprecated", which corresponds to the set of
maintained modules included in standard Qt releases; this is also the
default module subset when this option is not given. Entries
may be prefixed with a dash to exclude them from a bigger
set, e.g. "all,-ignore".
--no-update
@@ -294,7 +297,8 @@ use constant {
STS_ESSENTIAL => 2,
STS_ADDON => 3,
STS_DEPRECATED => 4,
STS_OBSOLETE => 5
STS_OBSOLETE => 5,
STS_ADDITIONAL => 6
};
sub git_clone_all_submodules
@@ -332,6 +336,8 @@ sub git_clone_all_submodules
$subinits{$1} = STS_DEPRECATED;
} elsif ($3 eq "obsolete") {
$subinits{$1} = STS_OBSOLETE;
} elsif ($3 eq "additionalLibrary") {
$subinits{$1} = STS_ADDITIONAL;
} elsif ($3 eq "ignore") {
delete $subinits{$1};
} else {
@@ -351,6 +357,8 @@ sub git_clone_all_submodules
@what = grep { ($subinits{$_} || 0) eq STS_ESSENTIAL } keys %subbases;
} elsif ($mod eq "addon") {
@what = grep { ($subinits{$_} || 0) eq STS_ADDON } keys %subbases;
} elsif ($mod eq "additionalLibrary") {
@what = grep { ($subinits{$_} || 0) eq STS_ADDITIONAL } keys %subbases;
} elsif ($mod eq "preview") {
@what = grep { ($subinits{$_} || 0) eq STS_PREVIEW } keys %subbases;
} elsif ($mod eq "deprecated") {
@@ -641,7 +649,7 @@ sub run
die("Have no origin remote.\n") if (!$url);
$url =~ s,\.git$,,;
$url =~ s/((?:tqtc-)?qt5)$//;
my $qtrepo = $1 or 'qt5';
my $qtrepo = $1 || 'qt5';
$self->{'base-url'} = $url;
$self->git_clone_all_submodules($qtrepo, $self->{branch}, $self->{alternates}, @{$self->{'module-subset'}});

2
qt3d

Submodule qt3d updated: dd698034fd...729697ebe2

2
qtbase

Submodule qtbase updated: 723077eb35...0ff1dc7110

1
qtcoap Submodule

Submodule qtcoap added at 618c330f08

2
qtdoc

Submodule qtdoc updated: 5290cda943...4ae0238397

1
qtmqtt Submodule

Submodule qtmqtt added at 150e35d480

1
qtopcua Submodule

Submodule qtopcua added at 2131f67494

2
qtqa

Submodule qtqa updated: b0eee13d43...a054f63dcf

2
qtsvg

Submodule qtsvg updated: af7b4e8d7d...db10071991

Submodule qttools updated: e9c0625d07...792adc3dd0