From 0ec6aad4551ae68742c369387b9edbd49c0db589 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 16 Nov 2017 20:31:38 +0100 Subject: [PATCH 01/17] Update submodules on '5.9' in qt5 Change-Id: I1784fb95e461ceba61f8a91a410407f43116631b Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtsvg | 2 +- qttranslations | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtxmlpatterns | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/qt3d b/qt3d index 252d2e5f..36005ba2 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 252d2e5f2a237862cc50f926f66184d499298239 +Subproject commit 36005ba2873613c398698cf66e564388f0a8c06e diff --git a/qtbase b/qtbase index 25b18fb2..ce08318a 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 25b18fb241315ed314b6b67f4b97028e2a1e484a +Subproject commit ce08318a46164172eaa72f4436cddf7f69ce9e1c diff --git a/qtconnectivity b/qtconnectivity index ca6b84af..7f0e5cb0 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit ca6b84af1612440a925b4a8223cbed4beb9ac33e +Subproject commit 7f0e5cb092574355f356777a3f2997c54e02139b diff --git a/qtdatavis3d b/qtdatavis3d index 32fc1c7d..34b202cf 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 32fc1c7d360fe2eff44666fb1a8c4fb7d538ddc7 +Subproject commit 34b202cf744bf7a5d076634ae2f64921ed3bc7e8 diff --git a/qtimageformats b/qtimageformats index feca51d8..a1504e8e 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit feca51d8c714781378cecc99122035348e0459bb +Subproject commit a1504e8ecfc683691eb4be1f81b6a6e7920d85ab diff --git a/qtlocation b/qtlocation index 714145e7..e78a5ab5 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 714145e7017afb74a23548ee9df2eff30536cfde +Subproject commit e78a5ab5cf4d932aea0503ac5684a95a235db8b1 diff --git a/qtmultimedia b/qtmultimedia index 4a214b19..cf4cc30d 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 4a214b199337a02e8cab77aa0cdca0c2805fb6a2 +Subproject commit cf4cc30da4566c1b8a86ee5688383f90eaf0e967 diff --git a/qtqa b/qtqa index 50691867..baa79eab 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 5069186722a01ea4f47d13fb79f6939428dcc2e4 +Subproject commit baa79eab7734031569fef9a4c1bf802fc2137f2f diff --git a/qtquickcontrols b/qtquickcontrols index 296810ea..a6d21e48 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 296810ea4bb4f734881a517eb101e5b948c1905b +Subproject commit a6d21e484a4d0f3308dbdb157e602ab5965bccf3 diff --git a/qtsvg b/qtsvg index c4c9b60d..18a2adad 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit c4c9b60dc4bbe3c3837c80ea63682f3ef9403277 +Subproject commit 18a2adad907523ea31251ff0b62e3321241a40fa diff --git a/qttranslations b/qttranslations index 2578a31f..069f791e 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 2578a31f573d4f80a33153f4165216be59a51162 +Subproject commit 069f791e56e2421c0e29c0358732aba4e275ad4c diff --git a/qtwayland b/qtwayland index bfd08f5e..8875bb56 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit bfd08f5ebd33e452c08595e5811698a16d3166fa +Subproject commit 8875bb5645742851e521d3a32a8a8779c46fc9f6 diff --git a/qtwebengine b/qtwebengine index d53efba0..e812237b 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit d53efba0b69e883ce70fa834856dcef61976725a +Subproject commit e812237b6980584fc5939f49f6a18315cc694c3a diff --git a/qtxmlpatterns b/qtxmlpatterns index b257f032..0b203483 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit b257f032350c555ea52a7dad5a52d0312ab93b5c +Subproject commit 0b20348321b0c5663e46f293ed0ceb3c68594e63 From 9468be52db979d803f41c9de4089e5514a4735d0 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 20 Nov 2017 20:11:14 +0100 Subject: [PATCH 02/17] Update submodules on '5.9' in qt5 Change-Id: I60dd3f3e809e3c82bc3216948e8a487c77ebb890 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtpurchasing | 2 +- qtrepotools | 2 +- qtserialbus | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qt3d b/qt3d index 36005ba2..e3e9372a 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 36005ba2873613c398698cf66e564388f0a8c06e +Subproject commit e3e9372a353b641580f15dbbc09a488b8cb26d64 diff --git a/qtbase b/qtbase index ce08318a..ba2f3a15 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit ce08318a46164172eaa72f4436cddf7f69ce9e1c +Subproject commit ba2f3a156ebc9ce3e6b6e59e231a5c2847163671 diff --git a/qtconnectivity b/qtconnectivity index 7f0e5cb0..22d20e81 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 7f0e5cb092574355f356777a3f2997c54e02139b +Subproject commit 22d20e81d866b79e1e9fefe3f24f93aeb687a450 diff --git a/qtdeclarative b/qtdeclarative index 6990ae6c..d710a3a5 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 6990ae6c1bad32952e371fa72bee65a7af11c313 +Subproject commit d710a3a5b7a0b120d84674dc328418930b87b774 diff --git a/qtpurchasing b/qtpurchasing index 34ab68ce..c431c2d2 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 34ab68cee42e0ad3033e5a1831b0ca20b5761461 +Subproject commit c431c2d28cabf711727c09ee37559e44357358e3 diff --git a/qtrepotools b/qtrepotools index ad7346df..bcb02535 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit ad7346df2ee44889eb9aad1d6781edf4aa7c3ef2 +Subproject commit bcb02535bcfff8fb867b632705195435c2c5cb16 diff --git a/qtserialbus b/qtserialbus index be9168ae..eec4d303 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit be9168aebae32a86094e6dfcb32b454b4887ff33 +Subproject commit eec4d3034e4f1371fe60728e3f84bcb8ddd32c93 From 6675a8f416a2745b7934740be1610210796c4297 Mon Sep 17 00:00:00 2001 From: Edward Welbourne Date: Fri, 24 Nov 2017 18:17:41 +0100 Subject: [PATCH 03/17] Add missing shbang to cmake provisioning script MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It was given execute permissions when renamed recently; but the bash-isms in it will only work with that if it uses bash. Change-Id: I61468257210ba586fdaf1e79531bae0492f9e8ae Reviewed-by: Tony Sarajärvi --- coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/009-cmake.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/009-cmake.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/009-cmake.sh index d7abd285..d10bc06d 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/009-cmake.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/009-cmake.sh @@ -1 +1,2 @@ +#!/usr/bin/env bash $(dirname $0)/../common/cmake_linux.sh From 92a7d95947d27ef249d902852657ff61cf824dc5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Tue, 14 Nov 2017 10:12:53 +0200 Subject: [PATCH 04/17] Fix indentation in platform configurations Change-Id: Id4a7bec02b0ee1156e80667538a29ca2baf4cfed Reviewed-by: Heikki Halmet --- coin/platform_configs/default.txt | 10 +++++----- coin/platform_configs/qt5.txt | 18 +++++++++--------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 06a17b54..0f047cdc 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -1,12 +1,12 @@ Template Target OS Target arch Compiler Features ----------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- qtci-windows-8.1-x86_64 MSVC2013 DeveloperBuild Release DisableTests -qtci-windows-10-x86_64-10 MSVC2015 DeveloperBuild Release QtNamespace QtLibInfix BuildExamples +qtci-windows-10-x86_64-10 MSVC2015 DeveloperBuild Release QtNamespace QtLibInfix BuildExamples qtci-windows-7-x86-3 Mingw53 DeveloperBuild Release OpenGLDynamic -qtci-windows-10-x86_64-10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic -qtci-windows-10-x86_64-10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic -qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic +qtci-windows-10-x86_64-10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic +qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-linux-Ubuntu-16.04-x86_64-1 GCC NoWidgets ForceDebugInfo qtci-linux-Ubuntu-16.04-x86_64-1 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples Documentation qtci-linux-openSUSE-42.3-x86_64 GCC DeveloperBuild NoPch diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 21c00e9d..d410c6aa 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -2,13 +2,13 @@ Template Target OS Target arch Compiler Features --------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- qtci-windows-8.1-x86_64 x86 MSVC2013 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests qtci-windows-8.1-x86_64 MSVC2013 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests -qtci-windows-10-x86_64-10 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-10 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-10-x86-6 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic -qtci-windows-10-x86_64-10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic -qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic +qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-7-x86-3 Mingw53 Packaging DebugAndRelease Release OpenGLDynamic DisableTests -qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-10 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-10 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-windows-7-x86-3 Android_ANY armv7 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-windows-7-x86-3 Android_ANY x86 Mingw53 Packaging Release DisableTests OpenGLES2 @@ -16,10 +16,10 @@ qtci-macos-10.12-x86_64-8 Android_ANY armv7 GCC Packagin qtci-macos-10.12-x86_64-8 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-macos-10.12-x86_64-8 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static -qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw53 Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 QNX_700 x86 Mingw53 Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 QNX_660 armv7 Mingw53 Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 QNX_660 x86 Mingw53 Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw53 Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-10 QNX_700 x86 Mingw53 Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-10 QNX_660 armv7 Mingw53 Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-10 QNX_660 x86 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-linux-RHEL-7.4-x86_64 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-RHEL-7.4-x86_64 QNX_700 armv7 GCC Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-RHEL-7.4-x86_64 INTEGRITY_11_04 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker From cdbd177b415a3826f8e85feec69757bf27f33ffa Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Mon, 27 Nov 2017 15:12:34 +0200 Subject: [PATCH 05/17] Provisioning: Install bluez-libs-devel MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit bluez-libs-devel is needed to enable Qt Bluetooth Task-number: QTBUG-64782 Change-Id: Ie668a44463307c7089bb96a087acab04c27dd3a0 Reviewed-by: Alex Blasche Reviewed-by: Tony Sarajärvi --- .../qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh index f7c6b694..8cdeee90 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh @@ -96,3 +96,6 @@ sudo yum -y install perl-Digest-SHA # INTEGRITY requirements sudo yum -y install glibc.i686 + +# Enable Qt Bluetooth +sudo yum -y install bluez-libs-devel From 6d37fda8c11d0860caad5a7968b6165843c05fa9 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 28 Nov 2017 18:38:42 +0200 Subject: [PATCH 06/17] Update submodules on '5.9' in qt5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I9938183f8c87a6bd34989c37045b5df8803b15d0 Reviewed-by: Tony Sarajärvi --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtpurchasing | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtrepotools | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 35 files changed, 35 insertions(+), 35 deletions(-) diff --git a/qt3d b/qt3d index e3e9372a..1129ff73 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit e3e9372a353b641580f15dbbc09a488b8cb26d64 +Subproject commit 1129ff731fca6aff5849cafe1f434f1882342cd7 diff --git a/qtactiveqt b/qtactiveqt index cacf666f..2ba06b5c 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit cacf666f95df9790cebf5d5cdb0609cee257fab3 +Subproject commit 2ba06b5ce1f5203999039d044009d04a5e8dc484 diff --git a/qtandroidextras b/qtandroidextras index 92e56ec2..458d2358 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 92e56ec250324b0b6d040b83a4fe41cdf6ed5af5 +Subproject commit 458d2358e0e67cfcc267bb428a866503b559bd38 diff --git a/qtbase b/qtbase index ba2f3a15..5f66f871 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit ba2f3a156ebc9ce3e6b6e59e231a5c2847163671 +Subproject commit 5f66f871816d083da9795d71f746413d6f6118f7 diff --git a/qtcanvas3d b/qtcanvas3d index 2dd53f17..26d3fb6d 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 2dd53f17ff626cd068be4cb04d793c53c71ed8f0 +Subproject commit 26d3fb6d1dc5346be654b82d362f3c128dc844ae diff --git a/qtcharts b/qtcharts index ab6f94d6..5d2cb8a4 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit ab6f94d6fb186d0003679fb4541c939555fd01c9 +Subproject commit 5d2cb8a429a7ed6244e80973cfcf94740859e174 diff --git a/qtconnectivity b/qtconnectivity index 22d20e81..a910c618 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 22d20e81d866b79e1e9fefe3f24f93aeb687a450 +Subproject commit a910c6185826977d5eabbb15ab2363761d6b75a3 diff --git a/qtdatavis3d b/qtdatavis3d index 34b202cf..cedc6261 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 34b202cf744bf7a5d076634ae2f64921ed3bc7e8 +Subproject commit cedc62610efb1add2a68a179a38db8e668560016 diff --git a/qtdeclarative b/qtdeclarative index d710a3a5..787dbda6 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit d710a3a5b7a0b120d84674dc328418930b87b774 +Subproject commit 787dbda672d6df4ff2336bb3afda62a233b88aaa diff --git a/qtdoc b/qtdoc index e4ccd4a7..d21d0d92 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit e4ccd4a7a2ac752b8f674f6b57dbaf9a33b9b5a8 +Subproject commit d21d0d92e799d045a30091a3079d8e8b3cc77c66 diff --git a/qtgamepad b/qtgamepad index 0e2408a2..c1e52bd4 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 0e2408a2729a5977182cb30d7e5ebd29a657673a +Subproject commit c1e52bd4a3f1fc996bd6b885b4e98ad5b216cbee diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 7ab12ad1..7d385752 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 7ab12ad1483607cf3f007c591e998f40f2ec9513 +Subproject commit 7d38575239d10598cb65b9f0ffabca0e018d07a5 diff --git a/qtimageformats b/qtimageformats index a1504e8e..e807afe5 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit a1504e8ecfc683691eb4be1f81b6a6e7920d85ab +Subproject commit e807afe5e218a1db802d2af1ba6c83a7ccf429f0 diff --git a/qtlocation b/qtlocation index e78a5ab5..3f06c2da 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit e78a5ab5cf4d932aea0503ac5684a95a235db8b1 +Subproject commit 3f06c2dad7c90771df3ea98435097bda9c08cbeb diff --git a/qtmacextras b/qtmacextras index 25127376..508db880 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 25127376ff49055eec43039c9bf6795f58de1e94 +Subproject commit 508db880f0e3506679c65ee24ff0935351daa484 diff --git a/qtmultimedia b/qtmultimedia index cf4cc30d..a621c53d 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit cf4cc30da4566c1b8a86ee5688383f90eaf0e967 +Subproject commit a621c53dd9103c3d41cb16763f7b7dba372b67a6 diff --git a/qtpurchasing b/qtpurchasing index c431c2d2..d5b1a88c 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit c431c2d28cabf711727c09ee37559e44357358e3 +Subproject commit d5b1a88c7a51bb4a192c20dd494dac580e238110 diff --git a/qtqa b/qtqa index baa79eab..1110bd07 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit baa79eab7734031569fef9a4c1bf802fc2137f2f +Subproject commit 1110bd076dba536dc6e6304fe8d6ee80f2d5718f diff --git a/qtquickcontrols b/qtquickcontrols index a6d21e48..00bfab66 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit a6d21e484a4d0f3308dbdb157e602ab5965bccf3 +Subproject commit 00bfab6671fda57cc34aa84335a6c47ffb0df98e diff --git a/qtquickcontrols2 b/qtquickcontrols2 index a0559ea8..bd617ed6 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit a0559ea88be32e19e83b2131cb26e61e873dc817 +Subproject commit bd617ed62ba35ee11da75b7e92db3fd190751b0f diff --git a/qtrepotools b/qtrepotools index bcb02535..14431b40 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit bcb02535bcfff8fb867b632705195435c2c5cb16 +Subproject commit 14431b4087125e247c1e2322e0cd043b78974ce2 diff --git a/qtscxml b/qtscxml index 3d238184..3aa7c73a 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 3d23818472e371745f4ad4bd4b6c92de3d119e34 +Subproject commit 3aa7c73a97af0d44666fc70570853182612c0c9a diff --git a/qtsensors b/qtsensors index a8f64f49..90e56c11 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit a8f64f49ddffd44ca748bb25758d6aa3e71d48ef +Subproject commit 90e56c11caa0251ed3f6f5620869512e1a8e6cf1 diff --git a/qtserialbus b/qtserialbus index eec4d303..0ace2c05 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit eec4d3034e4f1371fe60728e3f84bcb8ddd32c93 +Subproject commit 0ace2c053464ac08cc93a8319e38df50e1c3acbf diff --git a/qtserialport b/qtserialport index dd9fdb2b..8fd986ec 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit dd9fdb2ba4548f70eeceec2cfd2cd1ccdbbfc3d9 +Subproject commit 8fd986ec9aec0503985fbd0704f0671d58a1e3a5 diff --git a/qttools b/qttools index 4c2cae79..ead44273 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 4c2cae795117897847c0ba0e9b9ff20fa6e4eda9 +Subproject commit ead4427365690b72de63eaf2cd9a1f51fadcc0da diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 19cae9dd..78873735 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 19cae9ddecbff856e5ff0e294402091db0c2484b +Subproject commit 78873735b041f6eeb4bbd22d3284457ce40e9d06 diff --git a/qtwayland b/qtwayland index 8875bb56..a02a48fc 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 8875bb5645742851e521d3a32a8a8779c46fc9f6 +Subproject commit a02a48fc50203350c631dcb2032737a22a19b81b diff --git a/qtwebchannel b/qtwebchannel index 87044174..9196ca1b 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 87044174033f141d8d333e2a442d826d87db0415 +Subproject commit 9196ca1b09ba5cc6b6910c775906fcff4c4d6eac diff --git a/qtwebengine b/qtwebengine index e812237b..531665a2 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit e812237b6980584fc5939f49f6a18315cc694c3a +Subproject commit 531665a20c93b6b53fafdffbc3e58a923c3e3122 diff --git a/qtwebsockets b/qtwebsockets index 203da360..45771796 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 203da360c4bcd64bdd17639d495f1857b622e92d +Subproject commit 4577179620f98be257ad745c5b406d92b3b16aba diff --git a/qtwebview b/qtwebview index 71932e38..68423dce 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 71932e381ee12528f6516f61c5467f322d8ee903 +Subproject commit 68423dce756f1df7f282b8cdbe0c7fead91d1ff2 diff --git a/qtwinextras b/qtwinextras index ea7de894..494bde3b 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit ea7de894f711d8fa4f6cf78b5a409889849ee1f2 +Subproject commit 494bde3bd59465b1c953fb4449db1ae45b714e16 diff --git a/qtx11extras b/qtx11extras index f21ef0cd..d1a3ecdc 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit f21ef0cd01ccf1ccdbb2211eb935aff402741969 +Subproject commit d1a3ecdc4dc385f6f24791bf2e9ba8dc5041216f diff --git a/qtxmlpatterns b/qtxmlpatterns index 0b203483..431a23f2 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 0b20348321b0c5663e46f293ed0ceb3c68594e63 +Subproject commit 431a23f274f6bae1dc9e8cdd13b4ac993f5a0991 From 60f02cdfae9d2494b9aba4d25f59657f49be0398 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 30 Nov 2017 08:40:40 +0100 Subject: [PATCH 07/17] Update submodules on '5.9' in qt5 Change-Id: I133cfe933eb47073931c183fa56c540c06471ad6 Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qtbase b/qtbase index 5f66f871..6508fdca 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 5f66f871816d083da9795d71f746413d6f6118f7 +Subproject commit 6508fdca1dcc7105947befadba272d0fd4bbc27f diff --git a/qtdeclarative b/qtdeclarative index 787dbda6..8bdf3305 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 787dbda672d6df4ff2336bb3afda62a233b88aaa +Subproject commit 8bdf33051aa679db1f060314c6ccab1cb9a77a7a diff --git a/qtlocation b/qtlocation index 3f06c2da..cd24931b 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 3f06c2dad7c90771df3ea98435097bda9c08cbeb +Subproject commit cd24931b171f73d6ba71450493e9d5a8142a67a5 diff --git a/qtwayland b/qtwayland index a02a48fc..800c71ca 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit a02a48fc50203350c631dcb2032737a22a19b81b +Subproject commit 800c71ca816d76ac4de0616bf54b87f3c1f14c0a diff --git a/qtwebengine b/qtwebengine index 531665a2..5bd5dff7 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 531665a20c93b6b53fafdffbc3e58a923c3e3122 +Subproject commit 5bd5dff7b4267d26476043d7f89fe336dc9be5a6 diff --git a/qtwebsockets b/qtwebsockets index 45771796..1b9a3c75 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 4577179620f98be257ad745c5b406d92b3b16aba +Subproject commit 1b9a3c75259ceaa5e475b47e396a548c475df401 From 8ab923d0e5f0cc54904eddd80a814cab2b5d85ee Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Tue, 5 Dec 2017 08:35:48 +0100 Subject: [PATCH 08/17] Update submodules on '5.9' in qt5 Change-Id: I5f68733c3c00ae4c2d1d23898552c1d2f91dee14 Reviewed-by: Liang Qi --- qtbase | 2 +- qtcanvas3d | 2 +- qtcharts | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtwebengine | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qtbase b/qtbase index 6508fdca..0c9e379d 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 6508fdca1dcc7105947befadba272d0fd4bbc27f +Subproject commit 0c9e379dd8c57fab9d8e6ba8d35a0dca8ac05a0a diff --git a/qtcanvas3d b/qtcanvas3d index 26d3fb6d..f4d7923a 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 26d3fb6d1dc5346be654b82d362f3c128dc844ae +Subproject commit f4d7923aaaaee0c8fe131040de4dc3cf92fd7195 diff --git a/qtcharts b/qtcharts index 5d2cb8a4..6cde98b2 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 5d2cb8a429a7ed6244e80973cfcf94740859e174 +Subproject commit 6cde98b2254e6197a285a83617c952fd1d14cb3d diff --git a/qtdeclarative b/qtdeclarative index 8bdf3305..823428d9 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 8bdf33051aa679db1f060314c6ccab1cb9a77a7a +Subproject commit 823428d994b0ec0f6b85288d74554660a51b2406 diff --git a/qtlocation b/qtlocation index cd24931b..8552cf9d 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit cd24931b171f73d6ba71450493e9d5a8142a67a5 +Subproject commit 8552cf9d96d96dc500743dfbc117f0634cab0590 diff --git a/qtmultimedia b/qtmultimedia index a621c53d..c60d87c3 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit a621c53dd9103c3d41cb16763f7b7dba372b67a6 +Subproject commit c60d87c314d467997701729104ce02c9ed5c6501 diff --git a/qtwebengine b/qtwebengine index 5bd5dff7..f979b271 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 5bd5dff7b4267d26476043d7f89fe336dc9be5a6 +Subproject commit f979b271e158bc93b7361d4b891ed49ee58ab865 From b6a1fc6aaec15310f702b3873798363f5a89bb21 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 24 Nov 2017 16:35:48 +0200 Subject: [PATCH 09/17] Install command line tools for osx 10.11 and macOS 10.12 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Command line tools is needed by homebrew when installing p7zip Task-number: QTBUG-64729 Change-Id: Ia13838e3f5845351cb682c7d25127c8f36172d3b Reviewed-by: Liang Qi Reviewed-by: Jani Heikkinen (cherry picked from commit beb73056c30445c5236c7bbb12248bfa0939cb4a) Reviewed-by: Tony Sarajärvi --- .../common/install-commandlinetools.sh | 88 +++++++++++++++++++ .../021-install-commandlinetools.sh | 43 +++++++++ .../021-install-commandlinetools.sh | 43 +++++++++ 3 files changed, 174 insertions(+) create mode 100644 coin/provisioning/common/install-commandlinetools.sh create mode 100755 coin/provisioning/qtci-macos-10.12-x86_64/021-install-commandlinetools.sh create mode 100755 coin/provisioning/qtci-osx-10.11-x86_64/021-install-commandlinetools.sh diff --git a/coin/provisioning/common/install-commandlinetools.sh b/coin/provisioning/common/install-commandlinetools.sh new file mode 100644 index 00000000..f224d31d --- /dev/null +++ b/coin/provisioning/common/install-commandlinetools.sh @@ -0,0 +1,88 @@ +#!/bin/bash + +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the test suite 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$ +## +############################################################################# +source "${BASH_SOURCE%/*}/DownloadURL.sh" +source "${BASH_SOURCE%/*}/try_catch.sh" +set -ex + +# Command line tools is need by homebrew + +function InstallCommandLineTools { + + ExceptionMount=101 + ExceptionInstall=102 + ExceptionUnmount=103 + + url=$1 + url_alt=$2 + expectedSha1=$3 + packageName=$4 + version=$5 + + try + ( + DownloadURL $url $url_alt $expectedSha1 /tmp/$packageName + echo "Mounting $packageName" + hdiutil attach /tmp/$packageName || throw $ExceptionMount + cd "/Volumes/Command Line Developer Tools" + echo "Installing" + sudo installer -verbose -pkg *.pkg -target / || throw $ExceptionInstall + cd / + # Let's fait for 5 second before unmounting. Sometimes resource is busy and cant be unmounted + sleep 3 + echo "Unmounting" + umount /Volumes/Command\ Line\ Developer\ Tools/ || throw $ExceptionUnmount + echo "Removing $packageName" + rm /tmp/$packageName + + echo "Command Line Tools = $version" >> ~/versions.txt + ) + catch || { + case $ex_code in + $ExceptionMount) + echo "Failed to mount" + exit 1; + ;; + $ExceptionInstall) + echo "Failed to install" + exit 1; + ;; + $ExceptionUnmount) + echo "Failed to unmount" + exit 1; + + esac + } + +} diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/021-install-commandlinetools.sh b/coin/provisioning/qtci-macos-10.12-x86_64/021-install-commandlinetools.sh new file mode 100755 index 00000000..b460cc02 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.12-x86_64/021-install-commandlinetools.sh @@ -0,0 +1,43 @@ +#!/bin/bash + +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the test suite 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$ +## +############################################################################# +source "${BASH_SOURCE%/*}/../common/install-commandlinetools.sh" + +version="8.3.2" +packageName="CommandLineToolsforXcode$version.dmg" +url="http://ci-files01-hki.intra.qt.io/input/mac/$packageName" +sha1="da74b2bbf3058a0805c2d9f41ee5cf381d0e0ebe" + +InstallCommandLineTools $url $url $sha1 $packageName $version + diff --git a/coin/provisioning/qtci-osx-10.11-x86_64/021-install-commandlinetools.sh b/coin/provisioning/qtci-osx-10.11-x86_64/021-install-commandlinetools.sh new file mode 100755 index 00000000..9145c12a --- /dev/null +++ b/coin/provisioning/qtci-osx-10.11-x86_64/021-install-commandlinetools.sh @@ -0,0 +1,43 @@ +#!/bin/bash + +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the test suite 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$ +## +############################################################################# +source "${BASH_SOURCE%/*}/../common/install-commandlinetools.sh" + +version="8.2" +packageName="Command_Line_Tools_macOS_10.11_for_Xcode_$version.dmg" +url="http://ci-files01-hki.intra.qt.io/input/mac/$packageName" +sha1="4df615ca765ac1a1e681ddcbca79fc15990e3b25" + +InstallCommandLineTools $url $url $sha1 $packageName $version + From 5d9e2c49d116f62f263adf3e9502e06c33f59152 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Fri, 8 Dec 2017 14:51:01 +0200 Subject: [PATCH 10/17] Update ICC compiler from 2018 to 2018 update 1 Change-Id: I2e44c98114afe559e4490d9b9ec3e1d19d7f4696 Reviewed-by: Thiago Macieira Reviewed-by: Liang Qi --- .../qtci-linux-openSUSE-42.3-x86_64/018-icc.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/018-icc.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/018-icc.sh index 4933269a..15b46aef 100755 --- a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/018-icc.sh +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/018-icc.sh @@ -42,12 +42,12 @@ set -e mainStorage="ci-files01-hki.intra.qt.io:/hdd/www/input" localMount="/mnt/storage/" -iccPackage="parallel_studio_xe_2018_composer_edition_for_cpp.tgz" +iccPackage="parallel_studio_xe_2018_update1_composer_edition_for_cpp.tgz" iccPackageSource="$localMount/intel/$iccPackage" iccInstallPath="/opt/intel" iccTmpPath="/tmp/icc" -iccLicense="l_icc.lic" +iccLicense="l_icc_2018.lic" iccLicenseSource="$localMount/semisecure/$iccLicense" iccLicenseTarget="/home/qt/$iccLicense" @@ -79,7 +79,7 @@ EOT # Export LD_LIBRARY_PATH to Coin echo "export ICC64_18_LDLP=$iccInstallPath/lib/intel64" >>~/.bashrc -echo "export ICC64_18_PATH=$iccInstallPath/compilers_and_libraries_2018.0.128/linux/bin/intel64:$iccInstallPath/bin" >>~/.bashrc -echo "ICC = 18.0.0 20170811" >> ~/versions.txt +echo "export ICC64_18_PATH=$iccInstallPath/compilers_and_libraries_2018.1.163/linux/bin/intel64:$iccInstallPath/bin" >>~/.bashrc +echo "ICC = 18.0.1 20171018" >> ~/versions.txt rm -rf "$iccTmpPath" From d9f2fe1b7f9b90815b4056c89ec2f670ff12180f Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Tue, 21 Nov 2017 11:23:41 +0100 Subject: [PATCH 11/17] Add b2qt developer build for qtbase MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Because we had enabled this for qtdeclarative before. Change-Id: I1efd438ebf51b2e632d3f8f39bd707e7eb5a282e Reviewed-by: Tony Sarajärvi --- coin/platform_configs/qtbase.txt | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 coin/platform_configs/qtbase.txt diff --git a/coin/platform_configs/qtbase.txt b/coin/platform_configs/qtbase.txt new file mode 100644 index 00000000..45810bce --- /dev/null +++ b/coin/platform_configs/qtbase.txt @@ -0,0 +1,4 @@ +Template Target OS Target arch Compiler Features +--------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- +qtci-linux-Ubuntu-16.04-x86_64-1 QEMU armv7 GCC DeveloperBuild, DisableTests +qtci-linux-Ubuntu-16.04-x86_64-1 QEMU arm64 GCC DeveloperBuild, DisableTests From 7d04dc1a291b1306be2dad2c27a1b11ae6c11b63 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 17 Nov 2017 14:04:27 +0100 Subject: [PATCH 12/17] Move INTEGRITY build from qt5 to default MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Many failures in qtbase on INTEGRITY happened recently. Change-Id: Ic55259e694961a53199d30f095159728207f8824 Reviewed-by: Kimmo Ollila Reviewed-by: Tony Sarajärvi --- coin/platform_configs/default.txt | 1 + coin/platform_configs/qt5.txt | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 0f047cdc..39f0373d 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -22,3 +22,4 @@ qtci-linux-Ubuntu-16.04-x86_64-1 QEMU armv7 GCC qtci-linux-Ubuntu-16.04-x86_64-1 QEMU arm64 GCC Release qtci-linux-Ubuntu-16.04-x86_64-1 GCC TestOnly LicenseCheck qtci-linux-RHEL-6.6-x86_64 QNX_660 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.4-x86_64 INTEGRITY_11_04 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index d410c6aa..5282634a 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -22,4 +22,3 @@ qtci-windows-10-x86_64-10 QNX_660 armv7 Mingw53 Packagin qtci-windows-10-x86_64-10 QNX_660 x86 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-linux-RHEL-7.4-x86_64 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-RHEL-7.4-x86_64 QNX_700 armv7 GCC Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-linux-RHEL-7.4-x86_64 INTEGRITY_11_04 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker From b12a1591c404f2f0a4b0d00c7dc11650b811ee4e Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 8 Nov 2017 16:21:17 +0200 Subject: [PATCH 13/17] Provisioning: Install signing tools to Windows MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signing tools are needed when signing offline installers Change-Id: I98f12e3fdf01d273dff5fda0c2e34707174c6eae Reviewed-by: Tony Sarajärvi --- .../qtci-windows-10-x86_64/signing-tools.ps1 | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 coin/provisioning/qtci-windows-10-x86_64/signing-tools.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/signing-tools.ps1 b/coin/provisioning/qtci-windows-10-x86_64/signing-tools.ps1 new file mode 100644 index 00000000..882bd1de --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/signing-tools.ps1 @@ -0,0 +1,44 @@ +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2017 Pelagicore AG +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the test suite 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" + +# Signing tools are needed to sign offline installers when releasing + +$url = "http://ci-files01-hki.intra.qt.io/input/semisecure/sign/sign.zip" +$destination = "C:\Windows\temp\sign.zip" + +Download $url $url $destination +Extract-Zip "$destination" "C:\Utils" +Remove-Item "$destination" From 5089c4468f67daa2b28c710923ecfdd921f295e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joni=20J=C3=A4ntti?= Date: Fri, 24 Nov 2017 12:36:57 +0200 Subject: [PATCH 14/17] Fix mesa_llvmpipe provisioning script for x64 Windows MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This script doesn't extract the dll to System32 on a x64 system. Calling "sysnative" doesn't seem to work with the custom function being used. Change-Id: Iea734a400d8c095ea2e3fe54f38e4756fba406f9 Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/mesa_llvmpipe.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/provisioning/common/mesa_llvmpipe.ps1 b/coin/provisioning/common/mesa_llvmpipe.ps1 index 7ea0629d..82333034 100644 --- a/coin/provisioning/common/mesa_llvmpipe.ps1 +++ b/coin/provisioning/common/mesa_llvmpipe.ps1 @@ -55,7 +55,7 @@ function Extract-Mesa } if ( Test-Path C:\Windows\SysWOW64 ) { - Extract-Mesa $mesaOpenglUrl_64 $mesaOpenglSha1_64 "C:\Windows\sysnative" + Extract-Mesa $mesaOpenglUrl_64 $mesaOpenglSha1_64 "C:\Windows\System32" Extract-Mesa $mesaOpenglUrl_32 $mesaOpenglSha1_32 "C:\Windows\SysWOW64" } else { Extract-Mesa $mesaOpenglUrl_32 $mesaOpenglSha1_32 "C:\Windows\system32" From 77fdde0de933ef15aadad1a9e1baa50578ba6c1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joni=20J=C3=A4ntti?= Date: Wed, 29 Nov 2017 14:36:04 +0200 Subject: [PATCH 15/17] RHEL7.4: install packages in one yum instance MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently we are opening and closing a yum instance for every package we install during provisioning. This is a bit inefficient so it's better to install them in one go. Task-number: QTQAINFRA-1586 Change-Id: Idbf814f9023da0fe8213b2ed84cd1a27a149fc27 Reviewed-by: Tony Sarajärvi --- .../004-install-packages.sh | 89 ++++++++----------- 1 file changed, 37 insertions(+), 52 deletions(-) diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh index 8cdeee90..7bda43e2 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/004-install-packages.sh @@ -35,67 +35,52 @@ set -e -sudo yum -y update - -sudo yum -y install git -sudo yum -y install zlib-devel -sudo yum -y install glib2-devel -sudo yum -y install openssl-devel -sudo yum -y install freetype-devel -sudo yum -y install fontconfig-devel - +installPackages=() +installPackages+=(git) +installPackages+=(zlib-devel) +installPackages+=(glib2-devel) +installPackages+=(openssl-devel) +installPackages+=(freetype-devel) +installPackages+=(fontconfig-devel) # EGL support -sudo yum -y install mesa-libEGL-devel -sudo yum -y install mesa-libGL-devel - -sudo yum -y install libxkbfile-devel - +installPackages+=(mesa-libEGL-devel) +installPackages+=(mesa-libGL-devel) +installPackages+=(libxkbfile-devel) # Xinput2 -sudo yum -y install libXi-devel - -sudo yum -y install python-devel -sudo yum -y install mysql-server mysql -sudo yum -y install mysql-devel -sudo yum -y install postgresql-devel -sudo yum -y install cups-devel -sudo yum -y install dbus-devel - -# We have to downgrade to an older version of graphite2 -# to avoid a dependency version mismatch with gtk3-devel package. - -sudo yum -y downgrade graphite2-1.3.6-1.el7_2 - +installPackages+=(libXi-devel) +installPackages+=(python-devel) +installPackages+=(mysql-server) +installPackages+=(mysql) +installPackages+=(mysql-devel) +installPackages+=(postgresql-devel) +installPackages+=(cups-devel) +installPackages+=(dbus-devel) # gstreamer 1 for QtMultimedia -sudo yum -y install gstreamer1-devel gstreamer1-plugins-base-devel - +installPackages+=(gstreamer1-devel) +installPackages+=(gstreamer1-plugins-base-devel) # gtk3 style for QtGui/QStyle -sudo yum -y install gtk3-devel - +installPackages+=(gtk3-devel) # libusb1 for tqtc-boot2qt/qdb -sudo yum -y install libusb-devel - +installPackages+=(libusb-devel) # speech-dispatcher-devel for QtSpeech, otherwise it has no backend on Linux -sudo yum -y install speech-dispatcher-devel - +installPackages+=(speech-dispatcher-devel) # Python -sudo yum -y install python-devel python-virtualenv - +installPackages+=(python-devel python-virtualenv) # WebEngine -sudo yum -y install bison -sudo yum -y install flex -sudo yum -y install gperf -sudo yum -y install alsa-lib-devel -sudo yum -y install pulseaudio-libs-devel -sudo yum -y install libXtst-devel - +installPackages+=(bison) +installPackages+=(flex) +installPackages+=(gperf) +installPackages+=(alsa-lib-devel) +installPackages+=(pulseaudio-libs-devel) +installPackages+=(libXtst-devel) # For Android builds -sudo yum -y install java-1.8.0-openjdk-devel - +installPackages+=(java-1.8.0-openjdk-devel) # For receiving shasum -sudo yum -y install perl-Digest-SHA - +installPackages+=(perl-Digest-SHA) # INTEGRITY requirements -sudo yum -y install glibc.i686 - +installPackages+=(glibc.i686) # Enable Qt Bluetooth -sudo yum -y install bluez-libs-devel +installPackages+=(bluez-libs-devel) + +sudo yum -y update +sudo yum -y install "${installPackages[@]}" From 74dd14ae836e3432c990f6e8691d4c214bfa3f25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Tue, 5 Dec 2017 09:24:50 +0200 Subject: [PATCH 16/17] Remove provisioning scripts from non existing platform MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I01ecb0a9d4050b88fc5010f5a31baa6e776c1848 Reviewed-by: Joni Jäntti Reviewed-by: Simo Fält --- coin/provisioning/qtci-windows-8-x86/02-disable-ntp.ps1 | 1 - coin/provisioning/qtci-windows-8-x86_64/02-disable-ntp.ps1 | 1 - 2 files changed, 2 deletions(-) delete mode 100644 coin/provisioning/qtci-windows-8-x86/02-disable-ntp.ps1 delete mode 100644 coin/provisioning/qtci-windows-8-x86_64/02-disable-ntp.ps1 diff --git a/coin/provisioning/qtci-windows-8-x86/02-disable-ntp.ps1 b/coin/provisioning/qtci-windows-8-x86/02-disable-ntp.ps1 deleted file mode 100644 index 1042c846..00000000 --- a/coin/provisioning/qtci-windows-8-x86/02-disable-ntp.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\disable-ntp.ps1" diff --git a/coin/provisioning/qtci-windows-8-x86_64/02-disable-ntp.ps1 b/coin/provisioning/qtci-windows-8-x86_64/02-disable-ntp.ps1 deleted file mode 100644 index 1042c846..00000000 --- a/coin/provisioning/qtci-windows-8-x86_64/02-disable-ntp.ps1 +++ /dev/null @@ -1 +0,0 @@ -. "$PSScriptRoot\..\common\disable-ntp.ps1" From 828f82b6f00946c194b6909559bdce0b40d0f9a8 Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Tue, 5 Dec 2017 11:14:15 +0200 Subject: [PATCH 17/17] Add missing name prefixes for Win7 provision scripts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The prefix numbers were missing for Ruby and QNX patch scripts. Change-Id: I687b244c4657e17c32f0cc8221d3fb0ad3c5578d Reviewed-by: Tony Sarajärvi --- coin/provisioning/qtci-windows-7-x86/32-patch_qnx.ps1 | 1 + coin/provisioning/qtci-windows-7-x86/33-ruby.ps1 | 1 + coin/provisioning/qtci-windows-7-x86_64/26-ruby.ps1 | 1 + 3 files changed, 3 insertions(+) create mode 100644 coin/provisioning/qtci-windows-7-x86/32-patch_qnx.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86/33-ruby.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86_64/26-ruby.ps1 diff --git a/coin/provisioning/qtci-windows-7-x86/32-patch_qnx.ps1 b/coin/provisioning/qtci-windows-7-x86/32-patch_qnx.ps1 new file mode 100644 index 00000000..41210dcb --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/32-patch_qnx.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\patch_qnx.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/33-ruby.ps1 b/coin/provisioning/qtci-windows-7-x86/33-ruby.ps1 new file mode 100644 index 00000000..587a4c10 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/33-ruby.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\ruby.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86_64/26-ruby.ps1 b/coin/provisioning/qtci-windows-7-x86_64/26-ruby.ps1 new file mode 100644 index 00000000..587a4c10 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86_64/26-ruby.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\ruby.ps1"