From 3fa98fcbb5d163ee23dc23b01bc42cf653dfd194 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Thu, 23 Feb 2017 20:02:11 +0100 Subject: [PATCH 01/30] Update submodules on '5.6' in qt5 Change-Id: I6676715446aa572b96f4abe7d3d8932817bfaed1 Reviewed-by: Liang Qi --- qtbase | 2 +- qtmultimedia | 2 +- qtrepotools | 2 +- qtwebengine | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtbase b/qtbase index aad7e955..209aba1e 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit aad7e9551573ddf16bfba7a07ce6e24d92dc5483 +Subproject commit 209aba1e86e6136953a3903bf92987ec5a83ad4f diff --git a/qtmultimedia b/qtmultimedia index e0636deb..6d494812 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit e0636deb5807a68b018feb7733677557acccd6eb +Subproject commit 6d4948122063b651948a5c4db2197d633d7e96c4 diff --git a/qtrepotools b/qtrepotools index 51744f4f..ae6a386f 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 51744f4f0afd24c38a27505cb2a1feefa4af80ce +Subproject commit ae6a386fbf52867577d0bf54705fbcecf3197280 diff --git a/qtwebengine b/qtwebengine index 9464e7f4..898cea6a 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 9464e7f4646ce4bdc8e16c1716bf07345531db28 +Subproject commit 898cea6acf6e25dcf90589e111b2365eb815f94b From 460cfd01b3ee32bc35fcfb7b58c783680e14ddcc Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 3 Feb 2017 13:02:29 +0200 Subject: [PATCH 02/30] Provision: Storage icu version to versions.txt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ~/versions.txt will be used to storage sw version information Change-Id: Ia84e0fc55f5bbcf4afd902ce601556defcc565a0 Reviewed-by: Tony Sarajärvi --- coin/provisioning/qtci-linux-RHEL-6.6-x86_64/install_icu.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/install_icu.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/install_icu.sh index 02ddda3f..42db3716 100644 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/install_icu.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/install_icu.sh @@ -68,3 +68,6 @@ sudo cp -a $tempDir/lib/* /usr/lib64 sudo cp -a $tempDir/* /usr/ sudo /sbin/ldconfig + +# Storage version information to ~/versions.txt, which is used to print version information to provision log. +echo "ICU = $icuVersion" >> ~/versions.txt From 1269f1bc8a7a96e82af6983499661316bf2449cb Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 8 Mar 2017 08:57:13 +0100 Subject: [PATCH 03/30] Update submodules on '5.8' in qt5 Change-Id: Ic13d3040b541a4b4e9a293885ce49b0b9ba64afa Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtpurchasing | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qtwebengine | 2 +- qtwebkit | 2 +- qtxmlpatterns | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/qt3d b/qt3d index c668bde4..7c598178 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit c668bde4982ff7340de4e882aa45cf1db93bea98 +Subproject commit 7c59817810e74269a48b9f522a4b2013b426d3c2 diff --git a/qtbase b/qtbase index e3bcab93..3a1f4b18 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit e3bcab935c9fe37b344394c3ee8afd6773a8cd7e +Subproject commit 3a1f4b186d8ce79717da37f808ff9a4b3e949d9c diff --git a/qtdeclarative b/qtdeclarative index aa0e51be..fb0490dd 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit aa0e51beaba1a338db42391c575212b4aac815b1 +Subproject commit fb0490dd653e4856a3595bd7e49c3127215170d1 diff --git a/qtdoc b/qtdoc index 02eaf0cc..bd33a428 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 02eaf0cc58c462a6a5a0bf61dfb4961266b1966a +Subproject commit bd33a4280cb15c3910e4727452eeeaf54f4c75bf diff --git a/qtimageformats b/qtimageformats index 8f045f41..03e507c8 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 8f045f413e935ef9e7fdcef55c52343686a0f1aa +Subproject commit 03e507c8f3816053257b3c351d79c494b6f9174d diff --git a/qtlocation b/qtlocation index 3995bee7..31ff6793 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 3995bee767306476993134cb9c42499daf9ed1bc +Subproject commit 31ff679359172dfa068014ab0537418f5b852eac diff --git a/qtmultimedia b/qtmultimedia index 8d0e08e9..6f7192a0 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 8d0e08e96ffd8cd78fbb4a01f250dfb46117c636 +Subproject commit 6f7192a048432e4792330244b74a2a39ccd8d515 diff --git a/qtpurchasing b/qtpurchasing index 10902d98..b77af012 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 10902d9809e1df9be58d7408c0aceeef8a621b2d +Subproject commit b77af012b1e40e3531838652ea4114b77327bbd2 diff --git a/qtqa b/qtqa index 1561b922..02deca89 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 1561b922dfa49c071938f961e2cae7c51d766655 +Subproject commit 02deca89108dc761fb2f72923718e3c35ce8bf89 diff --git a/qtquickcontrols b/qtquickcontrols index 7b6f5708..fccae849 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 7b6f57086bbc64ad2f9be0c75a462120fc031e86 +Subproject commit fccae8499a4767cd0a012fa77988806a0c0f0f0e diff --git a/qtserialbus b/qtserialbus index 2f934cfb..6803fbb0 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 2f934cfb143df5fccdaab20b2982e54bb13a1bdf +Subproject commit 6803fbb01566e74df895326fb7805868696ce9c4 diff --git a/qtserialport b/qtserialport index 489d8ce0..39d79e16 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 489d8ce034c422549c1cb39da29de361695f4137 +Subproject commit 39d79e16577331f2a8f84df2f63d28e2f03a1ca4 diff --git a/qtspeech b/qtspeech index ecc425e3..8e931b8e 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit ecc425e33290abdda9a193b57f160d3195930586 +Subproject commit 8e931b8e88d8b6972edb8b092fea25c526f21e80 diff --git a/qtsvg b/qtsvg index 7738642c..f8137c81 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 7738642c0d8af7066ea488b239fbefa4b55ecca8 +Subproject commit f8137c81d38dc05f333afeaffc0f46a38a1e2f06 diff --git a/qttools b/qttools index 05fd8652..4e104dc3 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 05fd8652a7e43df2fc763222892f3c33bed7183f +Subproject commit 4e104dc3cb6a26df071bc33fc75cd3edac12c3a7 diff --git a/qtwebengine b/qtwebengine index 714bddf9..2d641398 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 714bddf9921a4e12f03867118c6a4697083e6a14 +Subproject commit 2d641398008ce8d58bb257f32e10914cd564405e diff --git a/qtwebkit b/qtwebkit index c3b710c3..c176f1fb 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit c3b710c3f4de2da0fd67c858949c3f420dfd175a +Subproject commit c176f1fbe8ed0d87c507811f4c0e4d67a71bc890 diff --git a/qtxmlpatterns b/qtxmlpatterns index f6e5f6ea..5b436694 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit f6e5f6eaf2eb958aa043440c8941b25339644360 +Subproject commit 5b4366944df6904e029e28d33d2a038af9dbc6a6 From 8c0390143b847b1b8ed7b8b42d5a09aa2c0025df Mon Sep 17 00:00:00 2001 From: Jason Erb Date: Tue, 7 Mar 2017 18:08:11 -0500 Subject: [PATCH 04/30] =?UTF-8?q?Remove=20init-repository=20assumption=20o?= =?UTF-8?q?f=20repo=20url=20=E2=80=9C=E2=80=A6/qt/=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTBUG-59355 Change-Id: I7bc2c94f13c6cf43bd9d4472f18b3b769e75954b Reviewed-by: Oswald Buddenhagen Reviewed-by: Edward Welbourne --- init-repository | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/init-repository b/init-repository index 7a97c199..570e124f 100755 --- a/init-repository +++ b/init-repository @@ -144,7 +144,7 @@ Options: For example: - --mirror user\@machine:/foo/bar/ + --mirror user\@machine:/foo/bar/qt/ ...will use the following as a mirror for qtbase: @@ -167,13 +167,13 @@ my $script_path = abs_path($0); $script_path =~ s,[/\\][^/\\]+$,,; my $GERRIT_SSH_BASE - = 'ssh://@USER@codereview.qt-project.org@PORT@/'; + = 'ssh://@USER@codereview.qt-project.org@PORT@/qt/'; my $BER_MIRROR_URL_BASE - = 'git://hegel/'; + = 'git://hegel/qt/'; my $OSLO_MIRROR_URL_BASE - = 'git://qilin/'; + = 'git://qilin/qt/'; sub new { @@ -638,12 +638,12 @@ sub run chomp(my $url = `git config remote.origin.url`); die("Have no origin remote.\n") if (!$url); $url =~ s,\.git$,,; - $url =~ s,qt/qt5$,,; + $url =~ s/qt5$//; $self->{'base-url'} = $url; - $self->git_clone_all_submodules('qt/qt5', $self->{branch}, @{$self->{'module-subset'}}); + $self->git_clone_all_submodules('qt5', $self->{branch}, @{$self->{'module-subset'}}); - $self->git_add_remotes('qt/qt5'); + $self->git_add_remotes('qt5'); $self->git_install_hooks; From b037d8f7b12ed95c8102230c9dfa52e0b49e34a7 Mon Sep 17 00:00:00 2001 From: Kari Oikarinen Date: Fri, 24 Feb 2017 14:39:10 +0200 Subject: [PATCH 05/30] Provision libusb for 64-bit Windows 8 and 10 as well MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Amends 380fca84a9fe583e245355f2e36931473665cf0b. Change-Id: Ia6e1a3bf2465770f55201cd723b329af42984d2b Reviewed-by: Samuli Piippo Reviewed-by: Tony Sarajärvi --- coin/provisioning/qtci-windows-10-x86_64/libusb.ps1 | 1 + coin/provisioning/qtci-windows-8-x86_64/libusb.ps1 | 1 + 2 files changed, 2 insertions(+) create mode 100644 coin/provisioning/qtci-windows-10-x86_64/libusb.ps1 create mode 100644 coin/provisioning/qtci-windows-8-x86_64/libusb.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/libusb.ps1 b/coin/provisioning/qtci-windows-10-x86_64/libusb.ps1 new file mode 100644 index 00000000..a853ffef --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/libusb.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\libusb.ps1" diff --git a/coin/provisioning/qtci-windows-8-x86_64/libusb.ps1 b/coin/provisioning/qtci-windows-8-x86_64/libusb.ps1 new file mode 100644 index 00000000..a853ffef --- /dev/null +++ b/coin/provisioning/qtci-windows-8-x86_64/libusb.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\libusb.ps1" From e7c6dcdb320df023007baf44584de77b2f2bebdf Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Tue, 14 Mar 2017 09:24:28 +0100 Subject: [PATCH 06/30] Update submodules on '5.8' in qt5 Change-Id: Iac3e9b6581b2bb490c8c58ccf50cd4f14b6651a8 Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qtmultimedia | 2 +- qtpurchasing | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtscxml | 2 +- qtserialbus | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/qtbase b/qtbase index 3a1f4b18..4f324d46 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 3a1f4b186d8ce79717da37f808ff9a4b3e949d9c +Subproject commit 4f324d4655a093b406134624ff753eb518429b83 diff --git a/qtdeclarative b/qtdeclarative index fb0490dd..5adfb406 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit fb0490dd653e4856a3595bd7e49c3127215170d1 +Subproject commit 5adfb4063a64aa3ae27269330c1fb8960dda4082 diff --git a/qtmultimedia b/qtmultimedia index 6f7192a0..dded5ca1 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 6f7192a048432e4792330244b74a2a39ccd8d515 +Subproject commit dded5ca17812123cea3b6566891376f83036aab8 diff --git a/qtpurchasing b/qtpurchasing index b77af012..1e16d026 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit b77af012b1e40e3531838652ea4114b77327bbd2 +Subproject commit 1e16d026f1081ce132b999f0704ceeec269f3afd diff --git a/qtquickcontrols b/qtquickcontrols index fccae849..edc24e3c 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit fccae8499a4767cd0a012fa77988806a0c0f0f0e +Subproject commit edc24e3cd75eaf02a587f50b14dbd0288447179d diff --git a/qtquickcontrols2 b/qtquickcontrols2 index e91c9fea..91e29613 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit e91c9feab8a0cf4cff71cc68ab0f001b1531504f +Subproject commit 91e29613f9671989455345a01da9f840a98d06f9 diff --git a/qtscxml b/qtscxml index e49fd45c..75cb3ffe 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit e49fd45c0947d1b24937517c2d170283eadfc501 +Subproject commit 75cb3ffebcc7c1e617e3ba4b85adb147e30ca36e diff --git a/qtserialbus b/qtserialbus index 6803fbb0..a2575550 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 6803fbb01566e74df895326fb7805868696ce9c4 +Subproject commit a25755509faaedab51fdc3800b6b464d9aa78da0 diff --git a/qttools b/qttools index 4e104dc3..5e3617be 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 4e104dc3cb6a26df071bc33fc75cd3edac12c3a7 +Subproject commit 5e3617bef5bc7e4c98fb63514471c49800feef03 diff --git a/qtwayland b/qtwayland index 7d527c19..3d8b3113 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 7d527c1914710a511c06713bbda1572b767cea34 +Subproject commit 3d8b3113c2349b5e002ece39ff20118b471aac6e diff --git a/qtwebengine b/qtwebengine index 2d641398..315e656e 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 2d641398008ce8d58bb257f32e10914cd564405e +Subproject commit 315e656efa99fce4ec9e822d428eed8af4fd1022 From ce96014426107c99277c42509c4f91e6439406ff Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Tue, 14 Mar 2017 20:02:54 +0100 Subject: [PATCH 07/30] Update submodules on '5.6' in qt5 Change-Id: Ibb0fac8d2a36e6aeeb25aa91bb1a74403005205b Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qtqa | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtbase b/qtbase index 209aba1e..a44be23d 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 209aba1e86e6136953a3903bf92987ec5a83ad4f +Subproject commit a44be23de24c70e2a8c861c69371a5c7d8a0df97 diff --git a/qtdeclarative b/qtdeclarative index cdbda2e7..8e26ddf9 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit cdbda2e7bd84e7e41812b811890f017e0538b5b9 +Subproject commit 8e26ddf986d4f4309063ad0d81947c0fa14a2574 diff --git a/qtqa b/qtqa index 1561b922..02deca89 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 1561b922dfa49c071938f961e2cae7c51d766655 +Subproject commit 02deca89108dc761fb2f72923718e3c35ce8bf89 From 084d79e8b4671ce40e9b1044987578a92e1c0e3c Mon Sep 17 00:00:00 2001 From: Jason Erb Date: Mon, 13 Mar 2017 22:46:23 -0400 Subject: [PATCH 08/30] Reflect current URL in example comment Change-Id: I51091c69d2698ba23207a95d17f4748c22cd7cb7 Reviewed-by: Edward Welbourne --- init-repository | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init-repository b/init-repository index 570e124f..ff3390f8 100755 --- a/init-repository +++ b/init-repository @@ -381,7 +381,7 @@ sub git_clone_all_submodules # manually clone each repo here, so we can easily use reference repos, mirrors etc my @configresult = qx(git config -l); foreach my $line (@configresult) { - # Example line: submodule.qtqa.url=git://gitorious.org/qt/qtqa.git + # Example line: submodule.qtqa.url=git://code.qt.io/qt/qtqa.git next if ($line !~ /submodule\.([^.=]+)\.url=/); my $module = $1; From 6995b1e85d691cb3b61cb9c34f840aee97566f16 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Sat, 18 Mar 2017 20:02:03 +0100 Subject: [PATCH 09/30] Update submodules on '5.8' in qt5 Change-Id: Ibf0175771f357c30243b5d309cfb4facc4a6b31b Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtgamepad | 2 +- qtlocation | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qt3d b/qt3d index 7c598178..b0214109 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 7c59817810e74269a48b9f522a4b2013b426d3c2 +Subproject commit b02141091db3d5182aab6728f02239fce2c727af diff --git a/qtbase b/qtbase index 4f324d46..5c724a60 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 4f324d4655a093b406134624ff753eb518429b83 +Subproject commit 5c724a6087b0a647e8241d35f0d44bce08e35281 diff --git a/qtdeclarative b/qtdeclarative index 5adfb406..c2ca2cbf 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 5adfb4063a64aa3ae27269330c1fb8960dda4082 +Subproject commit c2ca2cbf04071ffb3aee6af8d5ab9084dfa1c091 diff --git a/qtgamepad b/qtgamepad index 72be0422..752d4319 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 72be0422f98cdcfa09b7aa019ce51ac473569db5 +Subproject commit 752d4319660daf69c725103dae5325cf898adbb5 diff --git a/qtlocation b/qtlocation index 31ff6793..06c473d9 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 31ff679359172dfa068014ab0537418f5b852eac +Subproject commit 06c473d9dfe162a1e55a1ebbc68ff89f4cd9a8ea diff --git a/qtwayland b/qtwayland index 3d8b3113..53c1cbcd 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 3d8b3113c2349b5e002ece39ff20118b471aac6e +Subproject commit 53c1cbcdae80f7036f0d1b8bd8dffbdc70ff3a9e diff --git a/qtwebengine b/qtwebengine index 315e656e..8e147ed3 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 315e656efa99fce4ec9e822d428eed8af4fd1022 +Subproject commit 8e147ed3be7740092de233a2a7c67ec890069649 From a2cd0b3102857f8e24a7e72fbc6bb7a0fec1659e Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 17 Mar 2017 20:03:02 +0100 Subject: [PATCH 10/30] Update submodules on '5.6' in qt5 Change-Id: I8050d2b9f1f2d3ad55f64c139410abc09f21dc6e Reviewed-by: Liang Qi --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index a44be23d..1cf75af3 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit a44be23de24c70e2a8c861c69371a5c7d8a0df97 +Subproject commit 1cf75af3f2f3430bab11f9ef1eea5deb4c59aa2e From 80b739b1e89cdc86d468a5707fa3951e8a307862 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 17 Mar 2017 13:34:17 +0200 Subject: [PATCH 11/30] Provisioning: Move Visual Studio installation to pre-provisioning Visual Studios will be pre-provisioned to tier1/vanilla os when visual studio update is needed. Even if using pre-configured offline installer with specific workload and components the installation is still taking too long. This way we'll reduce provisioning time significantly Change-Id: I1f831aef648716dc640ce9cbfb4e63aa54e7afd0 Reviewed-by: Akseli Salovaara --- coin/README | 5 +++ coin/platform_configs/default.txt | 4 +-- coin/platform_configs/qt5.txt | 6 ++-- .../msvc2015_update.ps1 | 0 .../06-msvc2015_update.ps1 | 33 ------------------- .../06-msvc2015_update.ps1 | 33 ------------------- 6 files changed, 10 insertions(+), 71 deletions(-) rename coin/{provisioning/common => pre-provisioning/qtci-windows-10-x86_64}/msvc2015_update.ps1 (100%) delete mode 100644 coin/provisioning/qtci-windows-10-x86/06-msvc2015_update.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86_64/06-msvc2015_update.ps1 diff --git a/coin/README b/coin/README index 2fb3fe2d..80f02fd4 100644 --- a/coin/README +++ b/coin/README @@ -3,6 +3,11 @@ Continuous Integration This directory contains files used by Qt's Continuous Integration system (Coin). +pre-provisioning +---------------- +Contains scripts which are used to install software to tier1 machines manually. +E.g. Visual studio installation takes too long to be included to automatic provisioning of tier2 templates. + provisioning ------------ Contains scripts that apply to different test machines in order to run automatic tests on them. diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 13fd27c9..a8ab6e49 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -6,8 +6,8 @@ qtci-windows-8-x86 MSVC2013 qtci-windows-8-x86_64 MSVC2013 Packaging DebugAndRelease Release OpenGLDynamic qtci-windows-7-x86 MSVC2010 Release DeveloperBuild QtNamespace QtLibInfix OpenGLDynamic qtci-windows-7-x86 Mingw49 Packaging DebugAndRelease Release OpenGLDynamic -qtci-windows-10-x86 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic -qtci-windows-10-x86_64 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic +qtci-windows-10-x86-3 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic +qtci-windows-10-x86_64-3 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic qtci-windows-8-x86_64 Windows_Phone_8_1 armv4 MSVC2013 Packaging DebugAndRelease Release DisableTests qtci-windows-8-x86_64 WinRT_8_1 MSVC2013 Packaging DebugAndRelease Release DisableTests qtci-linux-Ubuntu-14.04-x86_64 GCC NoWidgets ForceDebugInfo diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 3b446382..985c20c9 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -1,8 +1,8 @@ Template Target OS Target arch Compiler Features --------------------------- ------------------- ----------- ----------- ----------------------------------------------------------------------------------------------- qtci-windows-8-x86_64 Windows_Phone_8_1 x86 MSVC2013 Packaging DebugAndRelease Release DisableTests -qtci-windows-10-x86_64 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release DisableTests -qtci-windows-10-x86_64 WinRT_10 MSVC2015 Packaging DebugAndRelease Release DisableTests +qtci-windows-10-x86_64-3 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release DisableTests +qtci-windows-10-x86_64-3 WinRT_10 MSVC2015 Packaging DebugAndRelease Release DisableTests qtci-linux-RHEL-6.6-x86_64 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-windows-7-x86 Android_ANY armv7 Mingw49 Packaging Release DisableTests OpenGLES2 qtci-windows-7-x86 Android_ANY x86 Mingw49 Packaging Release DisableTests OpenGLES2 @@ -12,6 +12,6 @@ qtci-linux-RHEL-6.6-x86_64 QNX_660 x86 GCC Packagin qtci-windows-7-x86 QNX_660 armv7 Mingw49 Packaging Release DisableTests OpenGLES2 qtci-windows-7-x86 QNX_660 x86 Mingw49 Packaging Release DisableTests OpenGLES2 # target arch is used here only for documentation the value is ignored -qtci-windows-10-x86_64 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release DisableTests +qtci-windows-10-x86_64-3 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release DisableTests qtci-osx-10.11-x86_64 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static diff --git a/coin/provisioning/common/msvc2015_update.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1 similarity index 100% rename from coin/provisioning/common/msvc2015_update.ps1 rename to coin/pre-provisioning/qtci-windows-10-x86_64/msvc2015_update.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86/06-msvc2015_update.ps1 b/coin/provisioning/qtci-windows-10-x86/06-msvc2015_update.ps1 deleted file mode 100644 index 83ff3f48..00000000 --- a/coin/provisioning/qtci-windows-10-x86/06-msvc2015_update.ps1 +++ /dev/null @@ -1,33 +0,0 @@ -############################################################################# -## -## Copyright (C) 2017 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the provisioning scripts of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# -. "$PSScriptRoot\..\common\msvc2015_update.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/06-msvc2015_update.ps1 b/coin/provisioning/qtci-windows-10-x86_64/06-msvc2015_update.ps1 deleted file mode 100644 index 83ff3f48..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/06-msvc2015_update.ps1 +++ /dev/null @@ -1,33 +0,0 @@ -############################################################################# -## -## Copyright (C) 2017 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the provisioning scripts of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# -. "$PSScriptRoot\..\common\msvc2015_update.ps1" From 0b1af0bb2f8cad1aba0db1b5346020445abb573e Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 22 Mar 2017 20:07:44 +0100 Subject: [PATCH 12/30] Update submodules on '5.8' in qt5 Change-Id: Icc31f52cf5a77a4100dfd63acd32e1596ead3dad Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtmultimedia | 2 +- qtrepotools | 2 +- qtserialbus | 2 +- qtspeech | 2 +- qttools | 2 +- qtwebengine | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qtbase b/qtbase index 5c724a60..c587036d 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 5c724a6087b0a647e8241d35f0d44bce08e35281 +Subproject commit c587036dc630bc3cd00ad5ffc1529f25df185a26 diff --git a/qtdeclarative b/qtdeclarative index c2ca2cbf..29bf17de 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit c2ca2cbf04071ffb3aee6af8d5ab9084dfa1c091 +Subproject commit 29bf17dee1497972152566af6916fd0a20b784ee diff --git a/qtdoc b/qtdoc index bd33a428..2337a016 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit bd33a4280cb15c3910e4727452eeeaf54f4c75bf +Subproject commit 2337a01600ec81a70c8711a7c37a8e55bc14d121 diff --git a/qtmultimedia b/qtmultimedia index dded5ca1..4da8ca23 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit dded5ca17812123cea3b6566891376f83036aab8 +Subproject commit 4da8ca2397f0b5ca87c1915fc29e185d57e9020c diff --git a/qtrepotools b/qtrepotools index ae6a386f..91471704 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit ae6a386fbf52867577d0bf54705fbcecf3197280 +Subproject commit 91471704ad8d97bb1d16077e160f23eec45738d3 diff --git a/qtserialbus b/qtserialbus index a2575550..287c43c9 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit a25755509faaedab51fdc3800b6b464d9aa78da0 +Subproject commit 287c43c9c35e900dbf8e820c60d0b71cbe9099ef diff --git a/qtspeech b/qtspeech index 8e931b8e..4320724b 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 8e931b8e88d8b6972edb8b092fea25c526f21e80 +Subproject commit 4320724b8acd83aa4a398e7e7f42e8c1e0ee1976 diff --git a/qttools b/qttools index 5e3617be..26be5746 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 5e3617bef5bc7e4c98fb63514471c49800feef03 +Subproject commit 26be57463c9a29b40c205b2f19aaf9ae79b6ab6a diff --git a/qtwebengine b/qtwebengine index 8e147ed3..c554f334 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 8e147ed3be7740092de233a2a7c67ec890069649 +Subproject commit c554f3348cd0baea8221e668d41132cea0833a8a From 990625d8cb839e9b33fe05c06b16d1309b25ab61 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 29 Mar 2017 09:45:26 +0200 Subject: [PATCH 13/30] Update submodules on '5.9' in qt5 Change-Id: I7dfea76bca9df8ab4db1be65068ffa46b414ad3d Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtquickcontrols2 | 2 +- qtscript | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/qt3d b/qt3d index dcf35b5c..873e8ac0 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit dcf35b5cc8a23fa01e6496694e944501e92ea42e +Subproject commit 873e8ac06c606e71aafb9be9baa21143e6757df5 diff --git a/qtbase b/qtbase index 15fe60cf..bae0c4c1 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 15fe60cfdada84ea519f08e905d59cc3fb6d20cd +Subproject commit bae0c4c11a6dda52e5d1e9d6d7d0de3ebd47642b diff --git a/qtdeclarative b/qtdeclarative index e2863c80..73f365f9 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit e2863c80fed06104eedfe83bce2737f2d24908a6 +Subproject commit 73f365f9f2d04131ae27a5dba26255feda18baa2 diff --git a/qtdoc b/qtdoc index 64eaa17f..484a663e 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 64eaa17f22bce9804266f49a8e84ef1f041a061c +Subproject commit 484a663ee7d516d751f1fc349735b2c79efeb140 diff --git a/qtlocation b/qtlocation index bd63a1c5..a7cadd6f 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit bd63a1c5144945c134674e2b253afe26673ca13f +Subproject commit a7cadd6f5f5278220847dcb2c4897a3c40896ea3 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 9a8881bf..40f454db 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 9a8881bf3eca6d4589c056908fd3541c1a2a6eb5 +Subproject commit 40f454dbfe0e3c73e9d8a77d58938736000a70f4 diff --git a/qtscript b/qtscript index adec1e10..e00ca9b6 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit adec1e10f6a54d78c3c1e8944263787931fffc9f +Subproject commit e00ca9b6bec2adf78fd14e02376ecf1b55a93b0c diff --git a/qtserialbus b/qtserialbus index 71a31bf1..dc124162 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 71a31bf19bb0cce506638bc79ba96bc5e5da92fe +Subproject commit dc124162efeabe90b9025789391d1f0e15cef0f1 diff --git a/qtserialport b/qtserialport index 5c6a433d..d320f010 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 5c6a433d6a6a4176082036ae94931467101a199a +Subproject commit d320f01018f0273e4fea2e0a7aa8f30ee8129587 diff --git a/qtspeech b/qtspeech index e4ec1fc2..204f9efb 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit e4ec1fc2f7f2399547b66bc2cb51c33c17f1cd4d +Subproject commit 204f9efb70d10932877fb2c34aebae19096bac15 diff --git a/qttools b/qttools index ef4e761c..224a4bdc 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit ef4e761c7519449ff9bb0d0b14bd50c03228a39e +Subproject commit 224a4bdc0380b15e6a8f07dc0d4bf9ae4dae1996 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 956a6a04..1efffb8f 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 956a6a04a7a98be7c05320b504674260b4322851 +Subproject commit 1efffb8fea600c77925422cdf85f6c024ab3d8b2 diff --git a/qtwayland b/qtwayland index 1e1785c8..50fea6ae 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 1e1785c8d2b077c34a8ca1d4f93e5a75b269eac8 +Subproject commit 50fea6ae0e9ee863f02d0343baa06ccdf06b7238 diff --git a/qtwebengine b/qtwebengine index 817c117c..57fee86e 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 817c117cf89f15e1877107597c8daeff956fd1a6 +Subproject commit 57fee86eb2756a2f102e2bbeb16a443b84a17e01 From 8b59bbc2a4012214e496bbd96d91ba8715ed6ee3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Mon, 27 Feb 2017 15:04:41 +0200 Subject: [PATCH 14/30] Coin provisioning: Use arg instead of autodetecting architecture When provisioning windows machine, it seems that detecting architecture by checking [System.Environment]::Is64BitProcess doesn't work properly. Instead pass 32 or 64 as an argument when calling powershell script. Change-Id: I890ad141b8ef194275848d0e656431753463cd2b Reviewed-by: Heikki Halmet --- coin/platform_configs/default.txt | 18 +++++++++--------- coin/platform_configs/qt5.txt | 10 +++++----- .../common/01-windows_removethemall.ps1 | 5 ----- coin/provisioning/common/python.ps1 | 19 ++++++++++--------- .../qtci-windows-10-x86/07-python.ps1 | 1 + .../qtci-windows-10-x86/python.ps1 | 1 - .../qtci-windows-10-x86_64/07-python.ps1 | 1 + .../qtci-windows-10-x86_64/python.ps1 | 1 - .../qtci-windows-8-x86/06-python.ps1 | 1 + .../qtci-windows-8-x86/python.ps1 | 1 - .../qtci-windows-8-x86_64/06-python.ps1 | 1 + .../qtci-windows-8-x86_64/python.ps1 | 1 - 12 files changed, 28 insertions(+), 32 deletions(-) create mode 100644 coin/provisioning/qtci-windows-10-x86/07-python.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86/python.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/07-python.ps1 delete mode 100644 coin/provisioning/qtci-windows-10-x86_64/python.ps1 create mode 100644 coin/provisioning/qtci-windows-8-x86/06-python.ps1 delete mode 100644 coin/provisioning/qtci-windows-8-x86/python.ps1 create mode 100644 coin/provisioning/qtci-windows-8-x86_64/06-python.ps1 delete mode 100644 coin/provisioning/qtci-windows-8-x86_64/python.ps1 diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index a8ab6e49..72f482d5 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -1,15 +1,15 @@ Template Target OS Target arch Compiler Features ----------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-windows-8-x86_64 MSVC2013 DeveloperBuild Release BuildExamples -qtci-windows-8-x86_64 MSVC2012 DeveloperBuild Release QtNamespace QtLibInfix -qtci-windows-8-x86 MSVC2013 Packaging DebugAndRelease Release OpenGLDynamic -qtci-windows-8-x86_64 MSVC2013 Packaging DebugAndRelease Release OpenGLDynamic -qtci-windows-7-x86 MSVC2010 Release DeveloperBuild QtNamespace QtLibInfix OpenGLDynamic -qtci-windows-7-x86 Mingw49 Packaging DebugAndRelease Release OpenGLDynamic +qtci-windows-8-x86_64-2 MSVC2013 DeveloperBuild Release BuildExamples +qtci-windows-8-x86_64-2 MSVC2012 DeveloperBuild Release QtNamespace QtLibInfix +qtci-windows-8-x86-2 MSVC2013 Packaging DebugAndRelease Release OpenGLDynamic +qtci-windows-8-x86_64-2 MSVC2013 Packaging DebugAndRelease Release OpenGLDynamic +qtci-windows-7-x86-2 MSVC2010 Release DeveloperBuild QtNamespace QtLibInfix OpenGLDynamic +qtci-windows-7-x86-2 Mingw49 Packaging DebugAndRelease Release OpenGLDynamic qtci-windows-10-x86-3 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic qtci-windows-10-x86_64-3 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic -qtci-windows-8-x86_64 Windows_Phone_8_1 armv4 MSVC2013 Packaging DebugAndRelease Release DisableTests -qtci-windows-8-x86_64 WinRT_8_1 MSVC2013 Packaging DebugAndRelease Release DisableTests +qtci-windows-8-x86_64-2 Windows_Phone_8_1 armv4 MSVC2013 Packaging DebugAndRelease Release DisableTests +qtci-windows-8-x86_64-2 WinRT_8_1 MSVC2013 Packaging DebugAndRelease Release DisableTests qtci-linux-Ubuntu-14.04-x86_64 GCC NoWidgets ForceDebugInfo qtci-linux-Ubuntu-14.04-x86_64 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace qtci-linux-OpenSuSE-13.01-x86_64 GCC DeveloperBuild NoPch @@ -23,4 +23,4 @@ qtci-linux-RHEL-6.6-x86_64 Android_ANY armv7 GCC qtci-linux-Ubuntu-14.04-x86_64 Boot2Qt_Fido armv7 GCC DisableTests qtci-linux-RHEL-6.6-x86_64 QNX_660 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-Ubuntu-14.04-x86_64 GCC TestOnly LicenseCheck -qtci-windows-7-x86 Windows_7_Embedded armv4 MSVC2008 DeveloperBuild Release DisableTests OpenGLES2 +qtci-windows-7-x86-2 Windows_7_Embedded armv4 MSVC2008 DeveloperBuild Release DisableTests OpenGLES2 diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 985c20c9..3f9f3186 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -1,16 +1,16 @@ Template Target OS Target arch Compiler Features --------------------------- ------------------- ----------- ----------- ----------------------------------------------------------------------------------------------- -qtci-windows-8-x86_64 Windows_Phone_8_1 x86 MSVC2013 Packaging DebugAndRelease Release DisableTests +qtci-windows-8-x86_64-2 Windows_Phone_8_1 x86 MSVC2013 Packaging DebugAndRelease Release DisableTests qtci-windows-10-x86_64-3 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release DisableTests qtci-windows-10-x86_64-3 WinRT_10 MSVC2015 Packaging DebugAndRelease Release DisableTests qtci-linux-RHEL-6.6-x86_64 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-windows-7-x86 Android_ANY armv7 Mingw49 Packaging Release DisableTests OpenGLES2 -qtci-windows-7-x86 Android_ANY x86 Mingw49 Packaging Release DisableTests OpenGLES2 +qtci-windows-7-x86-2 Android_ANY armv7 Mingw49 Packaging Release DisableTests OpenGLES2 +qtci-windows-7-x86-2 Android_ANY x86 Mingw49 Packaging Release DisableTests OpenGLES2 qtci-osx-10.11-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 qtci-osx-10.11-x86_64 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 qtci-linux-RHEL-6.6-x86_64 QNX_660 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-windows-7-x86 QNX_660 armv7 Mingw49 Packaging Release DisableTests OpenGLES2 -qtci-windows-7-x86 QNX_660 x86 Mingw49 Packaging Release DisableTests OpenGLES2 +qtci-windows-7-x86-2 QNX_660 armv7 Mingw49 Packaging Release DisableTests OpenGLES2 +qtci-windows-7-x86-2 QNX_660 x86 Mingw49 Packaging Release DisableTests OpenGLES2 # target arch is used here only for documentation the value is ignored qtci-windows-10-x86_64-3 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release DisableTests diff --git a/coin/provisioning/common/01-windows_removethemall.ps1 b/coin/provisioning/common/01-windows_removethemall.ps1 index 9e64a34d..ebbf15dd 100644 --- a/coin/provisioning/common/01-windows_removethemall.ps1 +++ b/coin/provisioning/common/01-windows_removethemall.ps1 @@ -55,11 +55,6 @@ Function Remove-Path { [System.Environment]::SetEnvironmentVariable($name,$value,$type) } -# Remove Python -Remove C:\Python27 -Remove-Path C:\python27\scripts -Remove-Path C:\python27 - # Remove Android sdk and ndk Remove C:\utils\android* [Environment]::SetEnvironmentVariable("ANDROID_NDK_HOME",$null,"User") diff --git a/coin/provisioning/common/python.ps1 b/coin/provisioning/common/python.ps1 index 32972830..3edbc412 100644 --- a/coin/provisioning/common/python.ps1 +++ b/coin/provisioning/common/python.ps1 @@ -30,39 +30,40 @@ ## $QT_END_LICENSE$ ## ############################################################################# - +param([Int32]$archVer=32) . "$PSScriptRoot\helpers.ps1" # This script installs Python $version. # Python is required for building Qt 5 from source. -$version = "2.7.10" +$version = "2.7.13" $package = "C:\Windows\temp\python-$version.msi" # check bit version -if ([System.Environment]::Is64BitProcess -eq $TRUE) { +if ( $archVer -eq 64 ) { + echo "Running in 64 bit system" $externalUrl = "https://www.python.org/ftp/python/$version/python-$version.amd64.msi" $internalUrl = "http://ci-files01-hki.ci.local/input/windows/python-$version.amd64.msi" - $sha1 = "f3a474f6ab191f9b43034c0fb5c98301553775d4" + $sha1 = "d9113142bae8829365c595735e1ad1f9f5e2894c" } else { $externalUrl = "https://www.python.org/ftp/python/$version/python-$version.msi" $internalUrl = "http://ci-files01-hki.ci.local/input/windows/python-$version.msi" - $sha1 = "9e62f37407e6964ee0374b32869b7b4ab050d12a" + $sha1 = "7e3b54236dbdbea8fe2458db501176578a4d59c0" } echo "Fetching from URL..." Download $externalUrl $internalUrl $package Verify-Checksum $package $sha1 echo "Installing $package..." -cmd /c "$package /q" +cmd /c "msiexec /passive /i $package ALLUSERS=1" # We need to change allowZip64 from 'False' to 'True' to be able to create ZIP files that use the ZIP64 extensions when the zipfile is larger than 2 GB echo "Chancing allowZip64 value to 'True'..." (Get-Content C:\Python27\lib\zipfile.py) | ForEach-Object { $_ -replace "allowZip64=False", "allowZip64=True" } | Set-Content C:\Python27\lib\zipfile.py echo "Remove $package..." del $package -Add-Path $path +[Environment]::SetEnvironmentVariable("Path", $env:Path + ";C:\Python27;C:\Python27\Scripts", [EnvironmentVariableTarget]::Machine) -& python -m ensurepip +C:\Python27\python.exe -m ensurepip # Install python virtual env -pip.exe install virtualenv +C:\Python27\Scripts\pip.exe install virtualenv diff --git a/coin/provisioning/qtci-windows-10-x86/07-python.ps1 b/coin/provisioning/qtci-windows-10-x86/07-python.ps1 new file mode 100644 index 00000000..27c618e1 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/07-python.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\python.ps1" 32 diff --git a/coin/provisioning/qtci-windows-10-x86/python.ps1 b/coin/provisioning/qtci-windows-10-x86/python.ps1 deleted file mode 100644 index 5f8aa2f8..00000000 --- a/coin/provisioning/qtci-windows-10-x86/python.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\python.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/07-python.ps1 b/coin/provisioning/qtci-windows-10-x86_64/07-python.ps1 new file mode 100644 index 00000000..44c1c5ff --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/07-python.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\python.ps1" 64 diff --git a/coin/provisioning/qtci-windows-10-x86_64/python.ps1 b/coin/provisioning/qtci-windows-10-x86_64/python.ps1 deleted file mode 100644 index 5f8aa2f8..00000000 --- a/coin/provisioning/qtci-windows-10-x86_64/python.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\python.ps1" diff --git a/coin/provisioning/qtci-windows-8-x86/06-python.ps1 b/coin/provisioning/qtci-windows-8-x86/06-python.ps1 new file mode 100644 index 00000000..27c618e1 --- /dev/null +++ b/coin/provisioning/qtci-windows-8-x86/06-python.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\python.ps1" 32 diff --git a/coin/provisioning/qtci-windows-8-x86/python.ps1 b/coin/provisioning/qtci-windows-8-x86/python.ps1 deleted file mode 100644 index 5f8aa2f8..00000000 --- a/coin/provisioning/qtci-windows-8-x86/python.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\python.ps1" diff --git a/coin/provisioning/qtci-windows-8-x86_64/06-python.ps1 b/coin/provisioning/qtci-windows-8-x86_64/06-python.ps1 new file mode 100644 index 00000000..44c1c5ff --- /dev/null +++ b/coin/provisioning/qtci-windows-8-x86_64/06-python.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\python.ps1" 64 diff --git a/coin/provisioning/qtci-windows-8-x86_64/python.ps1 b/coin/provisioning/qtci-windows-8-x86_64/python.ps1 deleted file mode 100644 index 5f8aa2f8..00000000 --- a/coin/provisioning/qtci-windows-8-x86_64/python.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\python.ps1" From e00cb3ac596db7200108174cd85c66f4e3c1107a Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Thu, 30 Mar 2017 14:05:16 +0300 Subject: [PATCH 15/30] Provisioning: Bug fix patch for msvc 2015 update 3 This bug fix patch is needed for QtWebEngine Change-Id: Id2c624461fbe27d9fd12a149281cae324bf8b14e Reviewed-by: Jani Heikkinen --- .../msvc_2015_update3_patch.ps1 | 50 +++++++++++++++++++ .../msvc_2015_update3_patch.ps1 | 50 +++++++++++++++++++ 2 files changed, 100 insertions(+) create mode 100644 coin/provisioning/qtci-windows-10-x86/msvc_2015_update3_patch.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86/msvc_2015_update3_patch.ps1 b/coin/provisioning/qtci-windows-10-x86/msvc_2015_update3_patch.ps1 new file mode 100644 index 00000000..f16b5ef4 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/msvc_2015_update3_patch.ps1 @@ -0,0 +1,50 @@ +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# +. "$PSScriptRoot\..\common\helpers.ps1" + +# Install Cumulative Servicing Release Visual Studio 2015 update 3 +# Original download page: https://msdn.microsoft.com/en-us/library/mt752379.aspx +# http://ci-files01-hki.ci.local/input/windows/vs14-kb3165756.exe + +$version = "2015 update3 (KB3165756)" +$package = "C:\Windows\Temp\vs14-kb3165756.exe" +$url_cache = "http://ci-files01-hki.ci.local/input/windows/vs14-kb3165756.exe" +$url_official = "http://go.microsoft.com/fwlink/?LinkID=816878" +$sha1 = "6a21d9b291ca75d44baad95e278fdc0d05d84c02" + +echo "Fetching patch for Visual Studio $version..." +Download $url_official $url_cache $package +Verify-Checksum $package $sha1 +echo "Installing patch for Visual Studio $version..." +cmd /c "$package /norestart /Quiet" +remove-item $package diff --git a/coin/provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1 b/coin/provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1 new file mode 100644 index 00000000..f16b5ef4 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/msvc_2015_update3_patch.ps1 @@ -0,0 +1,50 @@ +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# +. "$PSScriptRoot\..\common\helpers.ps1" + +# Install Cumulative Servicing Release Visual Studio 2015 update 3 +# Original download page: https://msdn.microsoft.com/en-us/library/mt752379.aspx +# http://ci-files01-hki.ci.local/input/windows/vs14-kb3165756.exe + +$version = "2015 update3 (KB3165756)" +$package = "C:\Windows\Temp\vs14-kb3165756.exe" +$url_cache = "http://ci-files01-hki.ci.local/input/windows/vs14-kb3165756.exe" +$url_official = "http://go.microsoft.com/fwlink/?LinkID=816878" +$sha1 = "6a21d9b291ca75d44baad95e278fdc0d05d84c02" + +echo "Fetching patch for Visual Studio $version..." +Download $url_official $url_cache $package +Verify-Checksum $package $sha1 +echo "Installing patch for Visual Studio $version..." +cmd /c "$package /norestart /Quiet" +remove-item $package From 30e0f087d46df1dde724607d7e8105aef3f918f4 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 31 Mar 2017 20:08:56 +0200 Subject: [PATCH 16/30] Update submodules on '5.9' in qt5 Change-Id: I64a699afde6c7444abfad5d0cac19f2d1d332f7f Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtdeclarative | 2 +- qtgamepad | 2 +- qtlocation | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/qt3d b/qt3d index 873e8ac0..3e664bf4 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 873e8ac06c606e71aafb9be9baa21143e6757df5 +Subproject commit 3e664bf438d4a3ab9a5f1633f2db171632b777b8 diff --git a/qtbase b/qtbase index bae0c4c1..8675e1c5 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit bae0c4c11a6dda52e5d1e9d6d7d0de3ebd47642b +Subproject commit 8675e1c5ee7d1209784a2320f1ae3f486b1eaae4 diff --git a/qtcanvas3d b/qtcanvas3d index ca69fc96..08458d0d 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit ca69fc961724d3a31c90e29ce3a7618b94b7c21c +Subproject commit 08458d0dcfba8421c03ed9c7dec7435619f0b70d diff --git a/qtdeclarative b/qtdeclarative index 73f365f9..f261a534 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 73f365f9f2d04131ae27a5dba26255feda18baa2 +Subproject commit f261a534cc96d41cee15462795844116887bd99a diff --git a/qtgamepad b/qtgamepad index b8426f8c..582bb5d9 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit b8426f8cd14ba551f43fcf4f3cce4990c9ef0477 +Subproject commit 582bb5d97668877e1e2b4a45bf78ad7542771f21 diff --git a/qtlocation b/qtlocation index a7cadd6f..6bc54fc4 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit a7cadd6f5f5278220847dcb2c4897a3c40896ea3 +Subproject commit 6bc54fc4b531e9cfeaa04296b4986ffb0f82dd3d diff --git a/qtquickcontrols b/qtquickcontrols index b84d25b2..8c37d58f 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit b84d25b20ed316529ae2fa091c5d9e2fbf45e023 +Subproject commit 8c37d58fa21fd3cf6897e2d7d4fe1f73c983d2f4 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 40f454db..f720bc8e 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 40f454dbfe0e3c73e9d8a77d58938736000a70f4 +Subproject commit f720bc8e38dfdc14c48ffe3178a704f5d130f932 diff --git a/qtremoteobjects b/qtremoteobjects index 4b65644d..330e73cc 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 4b65644d0f76773e9e2702d5737cc1c7fe9c64e6 +Subproject commit 330e73ccf1c7b541c81eae9347260a7ef383843a diff --git a/qtsensors b/qtsensors index 57465ced..760e6200 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 57465cedf68a98d6705191282007c7aae44c3148 +Subproject commit 760e62003843e79d0b9d56cfb1a64d4d86992b99 diff --git a/qtserialbus b/qtserialbus index dc124162..51860669 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit dc124162efeabe90b9025789391d1f0e15cef0f1 +Subproject commit 518606690eb1fa021aaecb8e75c6686c4ebea6cf diff --git a/qtspeech b/qtspeech index 204f9efb..b05d4f7c 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 204f9efb70d10932877fb2c34aebae19096bac15 +Subproject commit b05d4f7c61a454f1eaa2a7465dd2877425d43b2f diff --git a/qtsvg b/qtsvg index be428b21..e4038c6a 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit be428b21b777a04a1766adb880cb44e7b0b68e5a +Subproject commit e4038c6a3696973aca6db7f5442a8fb00a9b5bab diff --git a/qttools b/qttools index 224a4bdc..92efbd61 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 224a4bdc0380b15e6a8f07dc0d4bf9ae4dae1996 +Subproject commit 92efbd613a7f1aa3f8b0f54beeb2ae77ca98812a diff --git a/qtwayland b/qtwayland index 50fea6ae..ec81bfaf 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 50fea6ae0e9ee863f02d0343baa06ccdf06b7238 +Subproject commit ec81bfafe16ca021b529813228a095177e302d42 diff --git a/qtwebengine b/qtwebengine index 57fee86e..a76a364d 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 57fee86eb2756a2f102e2bbeb16a443b84a17e01 +Subproject commit a76a364d4fcecf7603e5c9bf888c19802559603b From 95223c7466afb4791f630cd76c6574f13e7506b3 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Sat, 1 Apr 2017 09:26:56 +0200 Subject: [PATCH 17/30] Update qtserialbus manually Change-Id: Ic4e1200a5d75e0c7b33fcb43efb27706260e3202 Reviewed-by: Liang Qi --- qtserialbus | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtserialbus b/qtserialbus index 51860669..943518be 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 518606690eb1fa021aaecb8e75c6686c4ebea6cf +Subproject commit 943518be292f929ff49a589eaa39f7de8a2a14a1 From 742737bd7c86ecb807c2c2bacd4558a47643963c Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 1 Apr 2017 15:31:18 +0200 Subject: [PATCH 18/30] Update submodules on '5.6' in qt5 Change-Id: I31ee5d48a4cdf6d7a28f9ec7b19c87b04f4b4e06 Reviewed-by: Liang Qi --- qtactiveqt | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtrepotools | 2 +- qtsvg | 2 +- qttools | 2 +- qtwebengine | 2 +- qtwebkit | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index 22330f9f..2fbd30b1 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 22330f9fb7eb79c6fd273abe469e93e5cb9432e7 +Subproject commit 2fbd30b1de6abcb7b660083dde120c8b03a3abbc diff --git a/qtbase b/qtbase index 1cf75af3..a647004d 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 1cf75af3f2f3430bab11f9ef1eea5deb4c59aa2e +Subproject commit a647004d9f349e0edc4254dcfe672ccf18f98ea7 diff --git a/qtdeclarative b/qtdeclarative index 8e26ddf9..be66de89 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 8e26ddf986d4f4309063ad0d81947c0fa14a2574 +Subproject commit be66de89e49286d0812f6a7bee19dccbf03dcb88 diff --git a/qtrepotools b/qtrepotools index ae6a386f..91471704 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit ae6a386fbf52867577d0bf54705fbcecf3197280 +Subproject commit 91471704ad8d97bb1d16077e160f23eec45738d3 diff --git a/qtsvg b/qtsvg index 6d255448..810b6def 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 6d255448e5d12379cc5411dade9b03a4bbf0fb70 +Subproject commit 810b6defac666c7652a77b5e4fd5b70a6fbe0c54 diff --git a/qttools b/qttools index e2ef038c..d8e6c1e5 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit e2ef038ceec6129ae282a9d26523d97126b9a4cb +Subproject commit d8e6c1e55d311afb6a0e37cb4d54ad51dec221da diff --git a/qtwebengine b/qtwebengine index 898cea6a..56edd178 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 898cea6acf6e25dcf90589e111b2365eb815f94b +Subproject commit 56edd178fc31f43297fcbd503edcba1dd5d9e6e8 diff --git a/qtwebkit b/qtwebkit index a52dd53a..8f0971a1 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit a52dd53ae4e1c33ee8400c65db3af868edd988b3 +Subproject commit 8f0971a1425e5d322af576581e225e4d0e6e5313 From 1bb9546b48c6aeb4377b3ab758b186d9d42796c3 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 1 Apr 2017 11:46:18 +0200 Subject: [PATCH 19/30] Update submodules on '5.8' in qt5 Change-Id: I551f0a875c9c16acbcd768994051e85d9fcde47c Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtserialbus | 2 +- qtsvg | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtxmlpatterns | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qt3d b/qt3d index b0214109..d56e5ea8 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit b02141091db3d5182aab6728f02239fce2c727af +Subproject commit d56e5ea8ad6096a5e7f5a20a8d572a721d89bf0d diff --git a/qtbase b/qtbase index c587036d..a03390a8 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit c587036dc630bc3cd00ad5ffc1529f25df185a26 +Subproject commit a03390a8b0318e30ae3b6dc9954093c137a20c32 diff --git a/qtconnectivity b/qtconnectivity index d8817ceb..42496770 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit d8817cebf11c9212f85a5359262d321f3c205c02 +Subproject commit 42496770e96334efdce9c29410051695be3310fb diff --git a/qtdeclarative b/qtdeclarative index 29bf17de..3caf24c5 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 29bf17dee1497972152566af6916fd0a20b784ee +Subproject commit 3caf24c514e7b5dfe62dc656d48282f3816dd6cc diff --git a/qtmultimedia b/qtmultimedia index 4da8ca23..d5d7dcfb 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 4da8ca2397f0b5ca87c1915fc29e185d57e9020c +Subproject commit d5d7dcfb15c0b5c5e9009b83fba922ea0b7e86f5 diff --git a/qtnetworkauth b/qtnetworkauth index 97db61d7..decac344 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 97db61d77432eefbc489d292cc95ed0a4902e77f +Subproject commit decac344458ddd45ec8f03d721d40795c7095404 diff --git a/qtserialbus b/qtserialbus index 287c43c9..90be9fc6 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 287c43c9c35e900dbf8e820c60d0b71cbe9099ef +Subproject commit 90be9fc65329509229eb17aef74e400fada58da9 diff --git a/qtsvg b/qtsvg index f8137c81..02ed4c65 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit f8137c81d38dc05f333afeaffc0f46a38a1e2f06 +Subproject commit 02ed4c65618b0f27b9ccb6867ab4d633612415c8 diff --git a/qttools b/qttools index 26be5746..ae482394 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 26be57463c9a29b40c205b2f19aaf9ae79b6ab6a +Subproject commit ae4823946c7ab4037d4bde8d4d0e43c046fea4cf diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 5fe45f3b..750030a9 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 5fe45f3bf60961519b89950e4a91aa14251499fd +Subproject commit 750030a93549b89ad5840faffd472b77c21e5780 diff --git a/qtwayland b/qtwayland index 53c1cbcd..67a4ac25 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 53c1cbcdae80f7036f0d1b8bd8dffbdc70ff3a9e +Subproject commit 67a4ac258e63bb38a4efe3109e1de1a7733127c9 diff --git a/qtxmlpatterns b/qtxmlpatterns index 5b436694..f799a226 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 5b4366944df6904e029e28d33d2a038af9dbc6a6 +Subproject commit f799a226b1025bf7158bc00dff35ee060f57a137 From df3c9ce7da99b87d17a1864da1d1df48b9f8468c Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 2 Apr 2017 07:11:46 +0200 Subject: [PATCH 20/30] Update submodules on '5.8' in qt5 Change-Id: I9444728a1fa2c23e65a3f809767509a0854f1e2d Reviewed-by: Liang Qi --- qt3d | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qt3d b/qt3d index d56e5ea8..c64df4a3 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit d56e5ea8ad6096a5e7f5a20a8d572a721d89bf0d +Subproject commit c64df4a307aff064433f57805561cb445c0e285f From e3d84a49c06917817462426aebee9d99abe3162c Mon Sep 17 00:00:00 2001 From: Sami Nurmenniemi Date: Thu, 30 Mar 2017 14:31:19 +0300 Subject: [PATCH 21/30] Remove fonts-noto-cjk on Ubuntu-16.04-x86_64 provision image First test using QFont fails if fonts-noto-cjk is installed. This happens because running fontcache for that font takes > 5 mins when run on QEMU. Running fc-cache doesn't help since host version creates cache for a wrong architecture and running armv7 fc-cache segfaults on QEMU. Change-Id: I6667b29ad4c4cae8d242e3af63defb603a6e6ec7 Reviewed-by: Simon Hausmann --- .../provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-qemu.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-qemu.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-qemu.sh index bd71bbe2..f978003b 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-qemu.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/003-qemu.sh @@ -58,3 +58,9 @@ sudo update-binfmts --package qemu-arm --install arm \ "\x7f\x45\x4c\x46\x01\x01\x01\x00\x00\x00\x00\x00\x00\x00\x00\x00\x02\x00\x28\x00" \ --mask \ "\xff\xff\xff\xff\xff\xff\xff\x00\xff\xff\xff\xff\xff\xff\xff\xff\xfe\xff\xff\xff" + +# First test using QFont fails if fonts-noto-cjk is installed. This happens because +# running fontcache for that font takes > 5 mins when run on QEMU. Running fc-cache +# doesn't help since host version creates cache for a wrong architecture and running +# armv7 fc-cache segfaults on QEMU. +sudo DEBIAN_FRONTEND=noninteractive apt-get -y remove fonts-noto-cjk From c55903eaa6d3d987c39e74e44b09d6f62883de23 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 4 Apr 2017 22:12:09 +0200 Subject: [PATCH 22/30] Update submodules on '5.9' in qt5 Change-Id: I549dc236009aadd78fb163a2a26b2384bb7de9ab Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtscxml | 2 +- qtserialbus | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/qt3d b/qt3d index 3e664bf4..dd20abe1 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 3e664bf438d4a3ab9a5f1633f2db171632b777b8 +Subproject commit dd20abe1d1be97bf5e9939b4e642120ef68ed439 diff --git a/qtactiveqt b/qtactiveqt index d79b3964..dfc34ee5 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit d79b396442753f71b8e498a991c7dd85538c7505 +Subproject commit dfc34ee575ca7790ec403c6510a9ccc469c07997 diff --git a/qtbase b/qtbase index 8675e1c5..1b2234c4 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 8675e1c5ee7d1209784a2320f1ae3f486b1eaae4 +Subproject commit 1b2234c4e7d8f1ddb9f22312b4563da2db5ad303 diff --git a/qtcharts b/qtcharts index d7d8bb10..cc4e79d6 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit d7d8bb10b6d4413376624a85760df857096955cb +Subproject commit cc4e79d6200b0495a5c4d1a7faa773906b1ac99e diff --git a/qtconnectivity b/qtconnectivity index 51914eff..39ed984d 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 51914eff36cb99823757bf2c970df46081351d32 +Subproject commit 39ed984d372f66299eba86be4e80e6ebffb96926 diff --git a/qtdatavis3d b/qtdatavis3d index 1a4d36af..b9bcebb3 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 1a4d36afc821d745fe304f222e73d6c2fa249afa +Subproject commit b9bcebb3808dc3fa2b6745cabdc272e1c933f7d5 diff --git a/qtdeclarative b/qtdeclarative index f261a534..42e9a5e2 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit f261a534cc96d41cee15462795844116887bd99a +Subproject commit 42e9a5e27c914c58dc9c734829f906fb7bb4f371 diff --git a/qtlocation b/qtlocation index 6bc54fc4..f4cd21d2 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 6bc54fc4b531e9cfeaa04296b4986ffb0f82dd3d +Subproject commit f4cd21d2fd642fbb161860f6b729621d4e159ae3 diff --git a/qtmultimedia b/qtmultimedia index 6c3b0fdb..ba120a9b 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 6c3b0fdb5ceb9079241cb7136d756e9dba114cfe +Subproject commit ba120a9ba02232d713f8495403158ef06a8e67d4 diff --git a/qtqa b/qtqa index 02deca89..e521ac18 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 02deca89108dc761fb2f72923718e3c35ce8bf89 +Subproject commit e521ac18a54babb2d4f2b3584d5bfdc521352b6a diff --git a/qtquickcontrols b/qtquickcontrols index 8c37d58f..da9183da 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 8c37d58fa21fd3cf6897e2d7d4fe1f73c983d2f4 +Subproject commit da9183da38513d5531af3753d14d040991e04132 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index f720bc8e..ab34a0e5 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit f720bc8e38dfdc14c48ffe3178a704f5d130f932 +Subproject commit ab34a0e545230db1a865af918d5a9c2ed6553224 diff --git a/qtscxml b/qtscxml index 06ee5829..e9406368 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 06ee5829c54e1aafeb03d387a8f5d6377a7ed115 +Subproject commit e9406368d46e806835c703e387b00598647cd446 diff --git a/qtserialbus b/qtserialbus index 943518be..86ae5181 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 943518be292f929ff49a589eaa39f7de8a2a14a1 +Subproject commit 86ae5181f462c923f2ef792db8f67f8228da0b25 diff --git a/qttools b/qttools index 92efbd61..374ec0ba 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 92efbd613a7f1aa3f8b0f54beeb2ae77ca98812a +Subproject commit 374ec0ba691e3cbcd7365778afdb59a7f9eb871d diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 1efffb8f..164c1b53 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 1efffb8fea600c77925422cdf85f6c024ab3d8b2 +Subproject commit 164c1b53af6c94963f9f25ff4be31f7a6c8ba4e0 diff --git a/qtwayland b/qtwayland index ec81bfaf..c26f8dbd 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit ec81bfafe16ca021b529813228a095177e302d42 +Subproject commit c26f8dbd5c5ff15167e90db529845091705cbe46 diff --git a/qtwebengine b/qtwebengine index a76a364d..cd3b4391 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit a76a364d4fcecf7603e5c9bf888c19802559603b +Subproject commit cd3b4391640cccbfc1e6ac61bdf38aec8dc29f9a From 30da853b975c7f94af0d37a5dc0942fd2ddb3ded Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Tue, 28 Mar 2017 12:49:58 +0200 Subject: [PATCH 23/30] Enable QEMU based ARM testing for qtdeclarative with Boot2Qt The module has been changed to run a sub-set of tests. With that in place we can enable test execution, providing us with some CI test coverage for the ARM JIT, for example. Change-Id: I5b0ad68fcd4fa8fb73f59432b42ccdd9a5b6fd59 Reviewed-by: Sami Nurmenniemi Reviewed-by: Lars Knoll --- coin/platform_configs/qtdeclarative.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 coin/platform_configs/qtdeclarative.txt diff --git a/coin/platform_configs/qtdeclarative.txt b/coin/platform_configs/qtdeclarative.txt new file mode 100644 index 00000000..c7552671 --- /dev/null +++ b/coin/platform_configs/qtdeclarative.txt @@ -0,0 +1,3 @@ +Template Target OS Target arch Compiler Features +------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- +qtci-linux-Ubuntu-16.04-x86_64 Boot2Qt_Jethro x86_64 GCC DeveloperBuild From 04ec42b9e10c11a6f1a1171c5b1ed4715ed23df5 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 5 Apr 2017 17:14:57 +0200 Subject: [PATCH 24/30] Update submodules on '5.8' in qt5 Change-Id: I39b5d0e9bddc2f5519cb08ac0b7b538a49a550b4 Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qttranslations | 2 +- qtwebengine | 2 +- qtwebkit | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qtbase b/qtbase index a03390a8..efb84b61 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit a03390a8b0318e30ae3b6dc9954093c137a20c32 +Subproject commit efb84b6189f9e98c6dd29c22f00ad760445196c2 diff --git a/qtdeclarative b/qtdeclarative index 3caf24c5..ab0c47e5 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 3caf24c514e7b5dfe62dc656d48282f3816dd6cc +Subproject commit ab0c47e5ef03eab9c80246e4d5c1af53a29ab0e1 diff --git a/qtqa b/qtqa index 02deca89..cdd49851 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 02deca89108dc761fb2f72923718e3c35ce8bf89 +Subproject commit cdd49851abf4aed4f960c4d7cef6c3bd08d5a961 diff --git a/qtquickcontrols b/qtquickcontrols index edc24e3c..378bd7b4 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit edc24e3cd75eaf02a587f50b14dbd0288447179d +Subproject commit 378bd7b4454a5a049072ae1043981984f30e8329 diff --git a/qttranslations b/qttranslations index c7d1706b..d90ae3ca 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit c7d1706b512649b4037421aa8f0c119efd23c93a +Subproject commit d90ae3caa88eeed99d70eb08873316e8432a64a6 diff --git a/qtwebengine b/qtwebengine index c554f334..df70ae6f 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit c554f3348cd0baea8221e668d41132cea0833a8a +Subproject commit df70ae6f3d37be262ae3b208bad26325a6dfcb4e diff --git a/qtwebkit b/qtwebkit index c176f1fb..0b48569e 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit c176f1fbe8ed0d87c507811f4c0e4d67a71bc890 +Subproject commit 0b48569e2bf9afc1b6ca5e359c3a948dd8c77619 From e7fc74d78121ecf7a9d14e8fb0e65cd441be3e83 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 5 Apr 2017 20:11:14 +0200 Subject: [PATCH 25/30] Update submodules on '5.6' in qt5 Change-Id: I89f138e0d359d429864351172c5d7cdc6475590c Reviewed-by: Liang Qi --- qtdeclarative | 2 +- qtqa | 2 +- qttranslations | 2 +- qtwebkit | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtdeclarative b/qtdeclarative index be66de89..aebb0f69 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit be66de89e49286d0812f6a7bee19dccbf03dcb88 +Subproject commit aebb0f69502a38262ae57cc905efbe5fdc315f9a diff --git a/qtqa b/qtqa index 02deca89..cdd49851 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 02deca89108dc761fb2f72923718e3c35ce8bf89 +Subproject commit cdd49851abf4aed4f960c4d7cef6c3bd08d5a961 diff --git a/qttranslations b/qttranslations index 8f0b19ce..e925ae19 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 8f0b19ce4c7127bb957e6dd2152b90445376bacc +Subproject commit e925ae199008908b971f02335acec41e3ebd80a2 diff --git a/qtwebkit b/qtwebkit index 8f0971a1..95a78c9f 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit 8f0971a1425e5d322af576581e225e4d0e6e5313 +Subproject commit 95a78c9f04d9a3f954477855f84180ced556a480 From 315b76dc9b48456018490675339c084b9e17b2d0 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 27 Mar 2017 16:01:31 +0200 Subject: [PATCH 26/30] fix url normalization after 8c0390143, we cannot rely on the denormalized segment starting with a slash any more. Task-number: QTBUG-59753 Change-Id: Ia3a3c005d1f41320747a60efc48a180caa88206b Reviewed-by: Edward Welbourne Reviewed-by: Valentin Fokin --- init-repository | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/init-repository b/init-repository index ff3390f8..861511b9 100755 --- a/init-repository +++ b/init-repository @@ -316,7 +316,7 @@ sub git_clone_all_submodules my ($mod, $base) = ($1, $3); next if ($base !~ /^\.\.\//); $base = $my_repo_base.'/'.$base; - while ($base =~ s,/(?!\.\./)[^/]+/\.\./,/,g) {} + while ($base =~ s,(?!\.\./)[^/]+/\.\./,,g) {} $subbases{$mod} = $base; } elsif ($2 eq "update") { push @subset, '-'.$1 if ($3 eq 'none'); From c675a237f12c092f77c6cc8a36d6294707b518b5 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 6 Apr 2017 16:23:42 +0200 Subject: [PATCH 27/30] Remove special configuration for xmlpatterns MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Commit 8b13ccf0238aecfe2a01e3a2e6d90620a8b9e516 in coin attempted to incrementally add OpenSuSE 42.1 support module by module, and various transitions have lead to this file. Meanwhile commit aa7531ca7d0e8f92c49a54f11460ece647ef73f1 in coin replaced OpenSuSE 13.01 globally with 42.1 for all modules, so this separate treatment is not needed anymore. Change-Id: I0e162a64816f7925a5afd5a79614a1e8843d9b7e Reviewed-by: Jędrzej Nowacki --- coin/platform_configs/qtxmlpatterns.txt | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 coin/platform_configs/qtxmlpatterns.txt diff --git a/coin/platform_configs/qtxmlpatterns.txt b/coin/platform_configs/qtxmlpatterns.txt deleted file mode 100644 index b57c0abc..00000000 --- a/coin/platform_configs/qtxmlpatterns.txt +++ /dev/null @@ -1,3 +0,0 @@ -Template Target OS Target arch Compiler Features -------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-linux-openSUSE-42.1-x86_64 GCC DeveloperBuild NoPch From b91aca3ab8fac4e3f474c766b15040cf73a86550 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 6 Apr 2017 19:31:35 +0200 Subject: [PATCH 28/30] Update submodules on '5.9' in qt5 Change-Id: I2ffc93d7195ab1d368a8dec8219be46acf1f74ee Reviewed-by: Simon Hausmann --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtgraphicaleffects | 2 +- qtnetworkauth | 2 +- qtqa | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtvirtualkeyboard | 2 +- qtwebengine | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/qt3d b/qt3d index dd20abe1..d9b4b28c 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit dd20abe1d1be97bf5e9939b4e642120ef68ed439 +Subproject commit d9b4b28c5383a5d338a670e48aa1a4e4ba9fa3d9 diff --git a/qtbase b/qtbase index 1b2234c4..0624085b 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 1b2234c4e7d8f1ddb9f22312b4563da2db5ad303 +Subproject commit 0624085b73ff4d6537e3dd406f6b3701806626d0 diff --git a/qtconnectivity b/qtconnectivity index 39ed984d..3d8a4325 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 39ed984d372f66299eba86be4e80e6ebffb96926 +Subproject commit 3d8a43250cf8293578b29b329c2a91d22e2fae79 diff --git a/qtdeclarative b/qtdeclarative index 42e9a5e2..7c709ee4 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 42e9a5e27c914c58dc9c734829f906fb7bb4f371 +Subproject commit 7c709ee4404e737bebd576c4a1782593a6ec7da0 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 69bb8a63..e66fd901 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 69bb8a63a5ff1a56629d58e4d03a3bee658c5447 +Subproject commit e66fd901fb9e18d45182db56ec3ce70f401d2ac4 diff --git a/qtnetworkauth b/qtnetworkauth index 8847f1e5..031ab0ce 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 8847f1e54d27c43ef744c39d28033e48764a254a +Subproject commit 031ab0ce77da942d12e84cb18a76be71f7533544 diff --git a/qtqa b/qtqa index e521ac18..cdd49851 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit e521ac18a54babb2d4f2b3584d5bfdc521352b6a +Subproject commit cdd49851abf4aed4f960c4d7cef6c3bd08d5a961 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index ab34a0e5..f8224c9c 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit ab34a0e545230db1a865af918d5a9c2ed6553224 +Subproject commit f8224c9c9e3dfc1fd4cc3bff915e7e2d1c411d05 diff --git a/qtremoteobjects b/qtremoteobjects index 330e73cc..d30914d4 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 330e73ccf1c7b541c81eae9347260a7ef383843a +Subproject commit d30914d4153af3dbf17408879c013dc33dfa6549 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 164c1b53..0e27ca2c 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 164c1b53af6c94963f9f25ff4be31f7a6c8ba4e0 +Subproject commit 0e27ca2c843d4e1b29276a8e175ce3360b6aecca diff --git a/qtwebengine b/qtwebengine index cd3b4391..1925b1af 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit cd3b4391640cccbfc1e6ac61bdf38aec8dc29f9a +Subproject commit 1925b1afb30f119fa6c0733a36d83215b7bac8f7 From 5656b4848e8c8bf60274c36094dede63aa93e89b Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 6 Feb 2017 20:48:22 +0100 Subject: [PATCH 29/30] serialize build of qtwebkit and qtwebengine linking both at the same time requires more than my 16GB of RAM, so introduce a .gitmodules field which serializes the two. in practice, it is just interpreted as an optional dependency. the CI system won't be taught about it, so this will not cause an unnecessary serialization there. Change-Id: I938537ebd3767a1184a5a31c4c026c70a05d499a Reviewed-by: Simon Hausmann --- .gitmodules | 1 + qt.pro | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 9bcdf4ce..b4d74220 100644 --- a/.gitmodules +++ b/.gitmodules @@ -72,6 +72,7 @@ [submodule "qtwebkit"] depends = qtbase recommends = qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel qtxmlpatterns + serialize = qtwebengine path = qtwebkit url = ../qtwebkit.git branch = 5.6 diff --git a/qt.pro b/qt.pro index f8d3d4d3..bf510fab 100644 --- a/qt.pro +++ b/qt.pro @@ -26,14 +26,14 @@ for (line, lines) { } QMAKE_INTERNAL_INCLUDED_FILES += $$PWD/.gitmodules -modules = $$sort_depends(modules, module., .depends .recommends) +modules = $$sort_depends(modules, module., .depends .recommends .serialize) modules = $$reverse(modules) for (mod, modules) { equals(module.$${mod}.qt, false): \ next() deps = $$eval(module.$${mod}.depends) - recs = $$eval(module.$${mod}.recommends) + recs = $$eval(module.$${mod}.recommends) $$eval(module.$${mod}.serialize) for (d, $$list($$deps $$recs)): \ !contains(modules, $$d): \ error("'$$mod' depends on undeclared '$$d'.") From 0c7c11ca56fdd99976a4a73742c31042c11ef519 Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev Date: Sun, 26 Mar 2017 20:44:22 +0300 Subject: [PATCH 30/30] Fix AltUrl of cmake for macOS provisioning Change-Id: I730a65c2fcbea14bd3fe44e01a182f095d96b0ab Reviewed-by: Simon Hausmann --- coin/provisioning/qtci-macos-10.12-x86_64/025-cmake.sh | 2 +- coin/provisioning/qtci-osx-10.11-x86_64/025-cmake.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/025-cmake.sh b/coin/provisioning/qtci-macos-10.12-x86_64/025-cmake.sh index 9f6df8cf..7234bf38 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/025-cmake.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/025-cmake.sh @@ -41,7 +41,7 @@ source "${BASH_SOURCE%/*}/../common/InstallAppFromCompressedFileFromURL.sh" PrimaryUrl="http://ci-files01-hki.ci.local/input/mac/macos_10.12_sierra/cmake-3.6.2-Darwin-x86_64.tar.gz" -AltUrl="https://cmake.org/files/v3.6/cmake-3.6.2-Linux-x86_64.tar.gz" +AltUrl="https://cmake.org/files/v3.6/cmake-3.6.2-Darwin-x86_64.tar.gz" SHA1="13835afa3aea939e07a7ecccedcc041dd8c3a86e" appPrefix="cmake-3.6.2-Darwin-x86_64" diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/025-cmake.sh b/coin/provisioning/qtci-osx-10.11-x86_64/025-cmake.sh index 3dadd9bc..085225d7 100755 --- a/coin/provisioning/qtci-osx-10.11-x86_64/025-cmake.sh +++ b/coin/provisioning/qtci-osx-10.11-x86_64/025-cmake.sh @@ -41,7 +41,7 @@ source "${BASH_SOURCE%/*}/../common/InstallAppFromCompressedFileFromURL.sh" PrimaryUrl="http://ci-files01-hki.ci.local/input/mac/osx_10.11_el_capitan/cmake-3.6.2-Darwin-x86_64.tar.gz" -AltUrl="https://cmake.org/files/v3.6/cmake-3.6.2-Linux-x86_64.tar.gz" +AltUrl="https://cmake.org/files/v3.6/cmake-3.6.2-Darwin-x86_64.tar.gz" SHA1="13835afa3aea939e07a7ecccedcc041dd8c3a86e" appPrefix="cmake-3.6.2-Darwin-x86_64"