From 245815a62001bc2b83eb13122d1c9864aa51b3f6 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 6 Oct 2018 22:30:54 +0200 Subject: [PATCH 01/17] Update submodules on '5.12' in qt5 Change-Id: Ibe3ea201ddcb9c555d458296e0f12fcc03fcf0e2 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtcharts | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtserialbus | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebview | 2 +- qtxmlpatterns | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/qt3d b/qt3d index ece6a775..6c77dea4 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit ece6a7759d4590b50ced79a0c86323318ac8815d +Subproject commit 6c77dea4711b6a88e80e30db21d622808e5ef9b6 diff --git a/qtbase b/qtbase index 18be2337..cd3374c4 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 18be2337ea85655e39f4ffe3b77d2b3ab243c140 +Subproject commit cd3374c4efb48f3088429c8735610e7c6b61d1af diff --git a/qtcharts b/qtcharts index 3ad48662..bd9f0b27 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 3ad4866256e9efdc313ac557326c2796dfac8dfb +Subproject commit bd9f0b27169dcbc3f8bb3914d3e21b1daddeeee5 diff --git a/qtdatavis3d b/qtdatavis3d index 913b61e0..12d9593d 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 913b61e09d5aead27be69fc31eefb4178a64e69a +Subproject commit 12d9593daeb8ffc7e50d068923afaf848083dcd4 diff --git a/qtdeclarative b/qtdeclarative index ec866a4d..5d7710a6 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit ec866a4d72ee5d07c44257d409796c171bcd04f2 +Subproject commit 5d7710a623ecde64316c42fd097db386ac28dd51 diff --git a/qtdoc b/qtdoc index 12280c1b..3d1aedbe 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 12280c1b0da0cc4a22238adeb62459299a897749 +Subproject commit 3d1aedbe81b160503b66206993a0e7af57eecb4c diff --git a/qtlocation b/qtlocation index eaffef63..8b702b66 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit eaffef633e98e2ea94acf5fd0e1a10676591bfa8 +Subproject commit 8b702b66aa09d6e59da1c99af353eac36cff01e4 diff --git a/qtmultimedia b/qtmultimedia index ad9f763e..7750d901 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit ad9f763efea36663bf17321459d44e8dd5e5e653 +Subproject commit 7750d9014ee38cffe349af5c50f715774e7b1982 diff --git a/qtserialbus b/qtserialbus index 4bfbdd3d..7577cd3f 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 4bfbdd3d061e88de147102db94e70283b89ffff5 +Subproject commit 7577cd3fa7ebfa35b199d485233f3b41cec79e46 diff --git a/qttools b/qttools index ede2bcd3..1251d225 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit ede2bcd3a9dacd31e0b274b2591850dd15cf8b7d +Subproject commit 1251d22560474bd5272ed31923bd42122a39f9ae diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 2c603d66..6bcc33ae 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 2c603d66246e80b1f974b9ad5f712136d83bb354 +Subproject commit 6bcc33aea90d5d725a08b51eda7374a50408ee07 diff --git a/qtwayland b/qtwayland index a1ca3ae5..35f07de3 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit a1ca3ae56f33bff34db71d1dec6104d0d6614e6d +Subproject commit 35f07de36baecc0fff7a2073995425b4da308220 diff --git a/qtwebengine b/qtwebengine index f89ded9f..51463310 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit f89ded9f17a59ca1ffe4d8711c0af4d54489e105 +Subproject commit 514633108e88da241b6bbcbc108e1fcecdadf366 diff --git a/qtwebview b/qtwebview index cd0814a2..eea4b92d 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit cd0814a2431db435279cf775a0fca460a0b81582 +Subproject commit eea4b92dbb1c333f073e6ad7f146957ac95624aa diff --git a/qtxmlpatterns b/qtxmlpatterns index d5762832..7df00373 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit d5762832ea8e5ca37457b2fa895bacf70173fde5 +Subproject commit 7df0037316cc2efa7ac082231b72a3fe5dcdfe8f From 61c4be2c0b4d2dc2759e26919bd43dfca76183bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Tue, 19 Jun 2018 15:15:43 +0300 Subject: [PATCH 02/17] Add Android arm64 targets Task-number: QTQAINFRA-2078 Change-Id: Icbc4fa27932e2a53d43bf1c72ddd2091f2801e5c Reviewed-by: BogDan Vatra Reviewed-by: Simon Hausmann --- coin/platform_configs/default.txt | 1 + coin/platform_configs/qt5.txt | 2 ++ 2 files changed, 3 insertions(+) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index eb9e6fac..e5c9c648 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -19,6 +19,7 @@ qtci-macos-10.13-x86_64 IOS_ANY multi Clang qtci-macos-10.13-x86_64 TvOS_ANY multi Clang DebugAndRelease DisableTests qtci-macos-10.13-x86_64 WatchOS_ANY multi Clang DebugAndRelease DisableTests qtci-linux-RHEL-7.4-x86_64 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.4-x86_64 Android_ANY arm64 Clang Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC Release qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC Release qtci-linux-Ubuntu-18.04-x86_64 GCC TestOnly LicenseCheck diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index f074aea7..781989cd 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -9,8 +9,10 @@ qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2017 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 Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-windows-7-x86-3 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2 +qtci-windows-7-x86-3 Android_ANY arm64 Mingw73 Clang Packaging Release DisableTests OpenGLES2 qtci-windows-7-x86-3 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2 qtci-macos-10.13-x86_64 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2 +qtci-macos-10.13-x86_64 Android_ANY arm64 Clang Clang Packaging Release DisableTests OpenGLES2 qtci-macos-10.13-x86_64 Android_ANY x86 Clang Clang Packaging Release DisableTests OpenGLES2 qtci-macos-10.13-x86_64 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw73 Packaging Release DisableTests OpenGLES2 From ab670f19673b97733556127c539a773b835bea8c Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 9 Oct 2018 13:08:30 +0200 Subject: [PATCH 03/17] Update submodules on '5.12' in qt5 Change-Id: If26ce4b6686cf5a704c9d64298a23159780a39e0 Reviewed-by: Liang Qi --- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtnetworkauth | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qtbase b/qtbase index cd3374c4..5c94130a 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit cd3374c4efb48f3088429c8735610e7c6b61d1af +Subproject commit 5c94130a6708a7f7b4631645e52abd8768a48b7b diff --git a/qtconnectivity b/qtconnectivity index 54f9fe2c..35a97ca4 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 54f9fe2c230963797dd4f0f9efed7132b0dc429e +Subproject commit 35a97ca4b43b4dc481b907d37204613460b07bbd diff --git a/qtdeclarative b/qtdeclarative index 5d7710a6..7cd9447e 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 5d7710a623ecde64316c42fd097db386ac28dd51 +Subproject commit 7cd9447e14159be90a5fdb927a4a3ed2cbff50b2 diff --git a/qtdoc b/qtdoc index 3d1aedbe..510c066b 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 3d1aedbe81b160503b66206993a0e7af57eecb4c +Subproject commit 510c066b66e4cfa7a0ffa1eedb53153f7c79315b diff --git a/qtnetworkauth b/qtnetworkauth index 876cd89e..0930d394 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 876cd89e273851f6e430d1f9ea47f6e667716c89 +Subproject commit 0930d394d7e2aa51499fc4f735556c97da85afe8 diff --git a/qtwayland b/qtwayland index 35f07de3..43d12496 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 35f07de36baecc0fff7a2073995425b4da308220 +Subproject commit 43d12496c684b5f2b08c6a8c0b994f06efc25712 diff --git a/qtwebengine b/qtwebengine index 51463310..8b0f6b34 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 514633108e88da241b6bbcbc108e1fcecdadf366 +Subproject commit 8b0f6b343dd807236001cacbae9bacb7e4923369 From 80aa7d0018710342b40aa43997ba6fe6d63d8c7f Mon Sep 17 00:00:00 2001 From: Andy Nichols Date: Tue, 9 Oct 2018 11:56:48 +0200 Subject: [PATCH 04/17] Update qt3d-runtime platform_configs Change-Id: I52ad38289e6a4b385a981bcf91933378651eafe7 Reviewed-by: Antti Kokko --- coin/platform_configs/qt3d-runtime.txt | 40 ++++++++++++++------------ 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/coin/platform_configs/qt3d-runtime.txt b/coin/platform_configs/qt3d-runtime.txt index 396b51dc..4c569615 100644 --- a/coin/platform_configs/qt3d-runtime.txt +++ b/coin/platform_configs/qt3d-runtime.txt @@ -1,19 +1,21 @@ -Template Target OS Target arch Compiler Features ---------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-10 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -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 Mingw73 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-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 -qtci-macos-10.12-x86_64-8 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 -qtci-macos-10.12-x86_64-8 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 -qtci-macos-10.12-x86_64-8 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static -qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw73 Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 QNX_700 armv8 Mingw73 Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 QNX_700 x86_64 Mingw73 Packaging Release DisableTests OpenGLES2 -qtci-linux-RHEL-7.4-x86_64 QNX_700 armv8 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-linux-RHEL-7.4-x86_64 QNX_700 x86_64 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +Template Target OS Target arch Compiler Target Compiler Features +--------------------------- ------------------- ----------- ----------- --------------- ------------------------------------------------------------------------------------- +qtci-windows-10-x86_64-10 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-10 x86 MSVC2017 DebugAndRelease Release ForceDebugInfo OpenGLDynamic +qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-7-x86-3 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests +qtci-windows-10-x86_64-10 Mingw73 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-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-windows-7-x86-3 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2 +qtci-windows-7-x86-3 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2 +qtci-macos-10.13-x86_64 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2 +qtci-macos-10.13-x86_64 Android_ANY x86 Clang Clang Packaging Release DisableTests OpenGLES2 +qtci-macos-10.13-x86_64 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-macos-10.13-x86_64 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static +qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw73 Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-10 QNX_700 armv8 Mingw73 Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-10 QNX_700 x86_64 Mingw73 Packaging Release DisableTests OpenGLES2 +qtci-linux-RHEL-7.4-x86_64 QNX_700 armv8 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.4-x86_64 QNX_700 x86_64 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker From af7dd645c8289eedf37d183c93524885b7036c77 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 13 Oct 2018 00:04:53 +0200 Subject: [PATCH 05/17] Update submodules on '5.12' in qt5 Change-Id: I93231f063bc3c3d29add8ade27803c8f87572dde Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtqa | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwebengine | 2 +- qtwebglplugin | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/qt3d b/qt3d index 6c77dea4..e549220a 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 6c77dea4711b6a88e80e30db21d622808e5ef9b6 +Subproject commit e549220a5daaedb13f167d6cde4a181666faec63 diff --git a/qtbase b/qtbase index 5c94130a..473d9a5f 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 5c94130a6708a7f7b4631645e52abd8768a48b7b +Subproject commit 473d9a5fc763d114fbfa1c0d2b5f8d03cab6e972 diff --git a/qtconnectivity b/qtconnectivity index 35a97ca4..c9ed3c49 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 35a97ca4b43b4dc481b907d37204613460b07bbd +Subproject commit c9ed3c49e3884ffad899d7ae28b2480691824228 diff --git a/qtdeclarative b/qtdeclarative index 7cd9447e..41e15cb2 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 7cd9447e14159be90a5fdb927a4a3ed2cbff50b2 +Subproject commit 41e15cb21c2f8924eee56aacc4ba8aace950cae5 diff --git a/qtdoc b/qtdoc index 510c066b..cf145d63 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 510c066b66e4cfa7a0ffa1eedb53153f7c79315b +Subproject commit cf145d63194ef8b6c44610a66daaee6a9d4b03cb diff --git a/qtimageformats b/qtimageformats index ceebd297..3e081dbc 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit ceebd297c3e4365940469347208e5f22b764d6a3 +Subproject commit 3e081dbc87eb3872197f56ddea8f55edf9c8aa3b diff --git a/qtlocation b/qtlocation index 8b702b66..0cdf4748 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 8b702b66aa09d6e59da1c99af353eac36cff01e4 +Subproject commit 0cdf4748dd40ec2e0df20eda4a63e8e070d2b790 diff --git a/qtqa b/qtqa index 1b2fcea1..0e82d4f9 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 1b2fcea1485a291e3be885bed29f03f920ac9d90 +Subproject commit 0e82d4f936ca3cf3186eda6cd074872194e8f8e7 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index fba7e3cf..700b5d89 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit fba7e3cf5c8ad287ceaaeb381989159d8baa96ec +Subproject commit 700b5d89a1040faba1145999e64ce31e37d5b782 diff --git a/qtremoteobjects b/qtremoteobjects index 0ebd459b..09a6746e 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 0ebd459bf781ff22a4a0aac460c230874cc0fe52 +Subproject commit 09a6746ec6d2a21415f8e0b0a8817510f1b8b2e9 diff --git a/qttools b/qttools index 1251d225..b29d3f5b 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 1251d22560474bd5272ed31923bd42122a39f9ae +Subproject commit b29d3f5b5b189297e0412f832111a91ae40fad42 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 6bcc33ae..8f881666 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 6bcc33aea90d5d725a08b51eda7374a50408ee07 +Subproject commit 8f8816668694c6eeba5ccf017d94c14dad946f02 diff --git a/qtwebengine b/qtwebengine index 8b0f6b34..75f6f4d3 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 8b0f6b343dd807236001cacbae9bacb7e4923369 +Subproject commit 75f6f4d3178d9356aff9a5a14f8601ebc8b70c95 diff --git a/qtwebglplugin b/qtwebglplugin index 36d9bcc2..e14f4569 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 36d9bcc2cf1f26afe7e336b13ce59aae54e3cec8 +Subproject commit e14f45692d5a0ffc15bfd3b85e4fd31d7e578d31 From 0ac22704fae8cf34755dff2e13d7293a9c2523f3 Mon Sep 17 00:00:00 2001 From: Juha Karjalainen Date: Mon, 8 Oct 2018 15:20:07 +0300 Subject: [PATCH 06/17] Provisioning: Disable powershell quickedit Powershell quickedit causes powershell window freeze until quickedit mode is exited by pressing enter. For some reason quickedit mode get's activated during build. This causes time out as agent does not get any output from processes. Task-number: QTQAINFRA-2263 Change-Id: I2878cc7a39bae504f826c5622cc5817fd227d7f0 Reviewed-by: Heikki Halmet --- .../common/windows/disable-quickedit.ps1 | 13 +++++++++++++ .../85-disable_quickedit_powershell.ps1 | 1 + .../85-disable_quickedit_powershell.ps1 | 1 + 3 files changed, 15 insertions(+) create mode 100644 coin/provisioning/common/windows/disable-quickedit.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86/85-disable_quickedit_powershell.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/85-disable_quickedit_powershell.ps1 diff --git a/coin/provisioning/common/windows/disable-quickedit.ps1 b/coin/provisioning/common/windows/disable-quickedit.ps1 new file mode 100644 index 00000000..09e18503 --- /dev/null +++ b/coin/provisioning/common/windows/disable-quickedit.ps1 @@ -0,0 +1,13 @@ +# Disabling cmd.exe and powershell QuickEdit && InsertMode +# +# These two can freeze console window on win10 sometimes +# manual recovery is pressing enter on console window + +. "$PSScriptRoot\helpers.ps1" + +Run-Executable "reg.exe" "ADD `"HKEY_CURRENT_USER\Console`" /V QuickEdit /T REG_dWORD /D 0 /F" +Run-Executable "reg.exe" "ADD `"HKEY_CURRENT_USER\Console`" /V InsertMode /T REG_dWORD /D 0 /F" +Run-Executable "reg.exe" "ADD `"HKEY_CURRENT_USER\Console\%SystemRoot%_System32_WindowsPowerShell_v1.0_powershell.exe`" /V QuickEdit /T REG_dWORD /D 0 /F" +Run-Executable "reg.exe" "ADD `"HKEY_CURRENT_USER\Console\%SystemRoot%_System32_WindowsPowerShell_v1.0_powershell.exe`" /V InsertMode /T REG_dWORD /D 0 /F" +Run-Executable "reg.exe" "ADD `"HKEY_CURRENT_USER\Console\%SystemRoot%_SysWOW64_WindowsPowerShell_v1.0_powershell.exe`" /V QuickEdit /T REG_dWORD /D 0 /F" +Run-Executable "reg.exe" "ADD `"HKEY_CURRENT_USER\Console\%SystemRoot%_SysWOW64_WindowsPowerShell_v1.0_powershell.exe`" /V InsertMode /T REG_dWORD /D 0 /F" diff --git a/coin/provisioning/qtci-windows-10-x86/85-disable_quickedit_powershell.ps1 b/coin/provisioning/qtci-windows-10-x86/85-disable_quickedit_powershell.ps1 new file mode 100644 index 00000000..547e15a8 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/85-disable_quickedit_powershell.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-quickedit.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/85-disable_quickedit_powershell.ps1 b/coin/provisioning/qtci-windows-10-x86_64/85-disable_quickedit_powershell.ps1 new file mode 100644 index 00000000..547e15a8 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/85-disable_quickedit_powershell.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-quickedit.ps1" From 0b1493a840cc439651546c58f950aba3f9dea08e Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Mon, 15 Oct 2018 13:33:06 +0300 Subject: [PATCH 07/17] Add packaging feature for MSVC2017 32 bit build Task-number: QTBUG-63708 Change-Id: Ib7897c5daffa49b014c95db5a6db9d350fe1a5e8 Reviewed-by: Antti Kokko --- coin/platform_configs/qt3d-runtime.txt | 2 +- coin/platform_configs/qt5.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/platform_configs/qt3d-runtime.txt b/coin/platform_configs/qt3d-runtime.txt index 4c569615..7d0db33a 100644 --- a/coin/platform_configs/qt3d-runtime.txt +++ b/coin/platform_configs/qt3d-runtime.txt @@ -1,7 +1,7 @@ Template Target OS Target arch Compiler Target Compiler Features --------------------------- ------------------- ----------- ----------- --------------- ------------------------------------------------------------------------------------- qtci-windows-10-x86_64-10 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-10 x86 MSVC2017 DebugAndRelease Release ForceDebugInfo OpenGLDynamic +qtci-windows-10-x86_64-10 x86 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 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests qtci-windows-10-x86_64-10 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 781989cd..04cce5eb 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -1,7 +1,7 @@ Template Target OS Target arch Compiler Target Compiler Features --------------------------- ------------------- ----------- ----------- --------------- ------------------------------------------------------------------------------------- qtci-windows-10-x86_64-10 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-10 x86 MSVC2017 DebugAndRelease Release ForceDebugInfo OpenGLDynamic +qtci-windows-10-x86_64-10 x86 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 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests qtci-windows-10-x86_64-10 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests From 9573b78b5667c7ed6a8d742e2687e107844343bd Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Mon, 8 Oct 2018 14:32:18 +0300 Subject: [PATCH 08/17] Provisioning: Use /dev/null when dealing with passwords MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This will prevent passwords showing in provisioning logs. Task-number: QTQAINFRA-2261 Change-Id: I501fd3be64514c59a604c1116113eaf975208024 Reviewed-by: Tony Sarajärvi --- .../qtci-macos-10.13-x86_64/55-signtools.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/55-signtools.sh b/coin/provisioning/qtci-macos-10.13-x86_64/55-signtools.sh index 0b9bbb00..b70a8a78 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/55-signtools.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/55-signtools.sh @@ -62,13 +62,13 @@ Install "$cache/semisecure/.qt-license" "$targetFolder/.qt-license" $sha1QtLicen # Login keychain sha1LoginKeychainPassword="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36" Install "$cacheSigningTools/login_keychain_password.txt" "$targetFolder/login_keychain_password.txt" "$sha1LoginKeychainPassword" -loginKeychainPassword=$(<"$targetFolder/login_keychain_password.txt") +{ loginKeychainPassword=$(<"$targetFolder/login_keychain_password.txt"); } 2> /dev/null loginKeychain=$keychains/login.keychain echo "Setting login.keychain as default keychain.." security default-keychain -s $loginKeychain* echo "Unlocking Login keychain with password.." -security unlock-keychain -p "$loginKeychainPassword" $loginKeychain* +{ security unlock-keychain -p "$loginKeychainPassword" $loginKeychain*; } 2> /dev/null echo "remove the "Lock after X minutes of inactivity" from login.keychain" security set-keychain-settings $loginKeychain @@ -86,7 +86,7 @@ sudo security add-certificates -k $loginKeychain* "$targetFolder/DeveloperIDCA.c # Create script to unlock keychain 'security unlock-keychain -p 'password' Developer_ID_TheQtCompany.keychain' sha1UnLockKeychain="4398870e3f558ad28c80566b5f70e24dc29ea724" unlockKeychain=$targetFolder/unlock-keychain.sh -Install "$cacheSigningTools/unlock-keychain.sh" "$unlockKeychain" $sha1UnLockKeychain +{ Install "$cacheSigningTools/unlock-keychain.sh" "$unlockKeychain" $sha1UnLockKeychain; } 2> /dev/null sudo chmod 755 "$unlockKeychain" # Codesigning requirements file. The bundle identifier in the requirements file should match the identifier of the application that is signed. @@ -104,27 +104,27 @@ open "$keychains/$devIDKeychain" sha1DeveloperIDTheQtCompanyKeychainPassword="d758e067736bbda7a91ffaec66cd38afdaf68ea6" Install "$cacheSigningTools/Developer_ID_TheQtCompany_keychain_password.txt" "$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt" "$sha1DeveloperIDTheQtCompanyKeychainPassword" -DeveloperIDTheQtCompanyKeychainPassword=$(<"$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt") +{ DeveloperIDTheQtCompanyKeychainPassword=$(<"$targetFolder/Developer_ID_TheQtCompany_keychain_password.txt"); } 2> /dev/null echo "Unlocking $devIDKeychain with password.." -security unlock-keychain -p "$DeveloperIDTheQtCompanyKeychainPassword" $keychains/Developer_ID_TheQtCompany.keychain +{ security unlock-keychain -p "$DeveloperIDTheQtCompanyKeychainPassword" $keychains/Developer_ID_TheQtCompany.keychain; } 2> /dev/null security set-keychain-settings $keychains/Developer_ID_TheQtCompany.keychain sha1Ios="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36" -Install "$cacheSigningTools/ios_password.txt" "$targetFolder/ios_password.txt" $sha1Ios -iosPassword=$(<"$targetFolder/ios_password.txt") +{ Install "$cacheSigningTools/ios_password.txt" "$targetFolder/ios_password.txt" $sha1Ios; } 2> /dev/null +{ iosPassword=$(<"$targetFolder/ios_password.txt"); } 2> /dev/null iPhoneDeveloper="iosdevelopment.p12" shaIPhoneDeveloper="f48f6827e8d0ccdc764cb987e401b9a6f7d3f10c" Install "$cacheSigningTools/latest_ios_cert/$iPhoneDeveloper" "$targetFolder/$iPhoneDeveloper" $shaIPhoneDeveloper echo "Importing $iPhoneDeveloper.." -security import $targetFolder/$iPhoneDeveloper -k $loginKeychain* -P $iosPassword -T /usr/bin/codesign +{ security import $targetFolder/$iPhoneDeveloper -k $loginKeychain* -P $iosPassword -T /usr/bin/codesign; } 2> /dev/null iPhoneDistribution="iosdistribution.p12" shaIPhoneDistribution="64b1174fc3ce0eca044fbc9fa144f6a2d4330171" Install "$cacheSigningTools/latest_ios_cert/$iPhoneDistribution" "$targetFolder/$iPhoneDistribution" $shaIPhoneDistribution echo "Importing $iPhoneDistribution.." -security import "$targetFolder/$iPhoneDistribution" -k $loginKeychain* -P $iosPassword -T /usr/bin/codesign +{ security import "$targetFolder/$iPhoneDistribution" -k $loginKeychain* -P $iosPassword -T /usr/bin/codesign; } 2> /dev/null # Mobileprovision echo "Creating directory $targetFolder/Library/MobileDevice/Provisioning Profiles.." From b365b3853e85eb985f769a8b772cc1165bfe590c Mon Sep 17 00:00:00 2001 From: Michal Klocek Date: Mon, 15 Oct 2018 16:31:43 +0200 Subject: [PATCH 09/17] Make quickcontrols1/2 and webchannel optional for webengine Fixes: QTBUG-70784 Change-Id: I845216123f7638afd69b39d5da8020a449ab40b8 Reviewed-by: Allan Sandfeld Jensen --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index eeba9f34..1c21bce2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -210,8 +210,8 @@ branch = 5.12 status = addon [submodule "qtwebengine"] - depends = qtquickcontrols qtwebchannel - recommends = qtlocation qttools + depends = qtdeclarative + recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel path = qtwebengine url = ../qtwebengine.git branch = 5.12 From 4061156381e8049f27840b8e064908f4d6056c99 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 17 Oct 2018 16:55:24 +0200 Subject: [PATCH 10/17] Update submodules on '5.12' in qt5 Change-Id: Ica33ddf6fa348ed65f7194127c80b6e539462e6a Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtimageformats | 2 +- qtmultimedia | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtscript | 2 +- qtserialbus | 2 +- qttools | 2 +- qtwebengine | 2 +- qtwinextras | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/qt3d b/qt3d index e549220a..17c12d5b 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit e549220a5daaedb13f167d6cde4a181666faec63 +Subproject commit 17c12d5b3939b5c67d4c5f68492d1d05792613f7 diff --git a/qtbase b/qtbase index 473d9a5f..1625e53c 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 473d9a5fc763d114fbfa1c0d2b5f8d03cab6e972 +Subproject commit 1625e53cc8cb24978e6011da148ff223f5c8f35f diff --git a/qtconnectivity b/qtconnectivity index c9ed3c49..97dc04e0 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit c9ed3c49e3884ffad899d7ae28b2480691824228 +Subproject commit 97dc04e0d74687b4cafab3676d3582f758a0a4cc diff --git a/qtdeclarative b/qtdeclarative index 41e15cb2..d973907f 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 41e15cb21c2f8924eee56aacc4ba8aace950cae5 +Subproject commit d973907f6e4aae492dfad3eaad6827ffdc49962b diff --git a/qtdoc b/qtdoc index cf145d63..e8422196 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit cf145d63194ef8b6c44610a66daaee6a9d4b03cb +Subproject commit e8422196ce16a0a9abdb2b342f9caeb8ef7a6149 diff --git a/qtimageformats b/qtimageformats index 3e081dbc..4783c6dc 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 3e081dbc87eb3872197f56ddea8f55edf9c8aa3b +Subproject commit 4783c6dc4441ab833050a08996d40d959960ecff diff --git a/qtmultimedia b/qtmultimedia index 7750d901..477125de 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 7750d9014ee38cffe349af5c50f715774e7b1982 +Subproject commit 477125deb6d76f8e0b2a837c00fd99649065a388 diff --git a/qtquickcontrols b/qtquickcontrols index 352be75d..c345d1dd 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 352be75dec15cb333f58d0075d89b2ebc7a2e46b +Subproject commit c345d1ddf66fa73660a299826b9e3a3328519bed diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 700b5d89..2876332a 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 700b5d89a1040faba1145999e64ce31e37d5b782 +Subproject commit 2876332ad911b3c0402006ca9116af66cecdb8eb diff --git a/qtscript b/qtscript index 42742b84..9b0fcf79 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 42742b847213f7041fc686d7e15182c4669f897d +Subproject commit 9b0fcf7943e63f35cf7d13c7771cb0185178e9fa diff --git a/qtserialbus b/qtserialbus index 7577cd3f..43a65b66 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 7577cd3fa7ebfa35b199d485233f3b41cec79e46 +Subproject commit 43a65b661f54755eb725e25112d62cb5eb726ac3 diff --git a/qttools b/qttools index b29d3f5b..54e8925e 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit b29d3f5b5b189297e0412f832111a91ae40fad42 +Subproject commit 54e8925e0997bb4606e4b5491d2d8e446db401ce diff --git a/qtwebengine b/qtwebengine index 75f6f4d3..c37ba6dc 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 75f6f4d3178d9356aff9a5a14f8601ebc8b70c95 +Subproject commit c37ba6dce65eadeafda5d18287eef6fedf6d1235 diff --git a/qtwinextras b/qtwinextras index 48b4b562..5e04d2d9 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 48b4b562a226cd2a8a8805d80b1a52fdc758b1de +Subproject commit 5e04d2d9d983a4304deafa439cd0b6b0107dc5d1 From 4c2fea3d5d22c6b499e82cd1dd21547e92b19edc Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 12 Oct 2018 16:30:03 +0200 Subject: [PATCH 11/17] fix setting QTDIR_build for default_pre.prf adding it to the super cache makes no sense, as that's read before spec_pre.prf, which clears CONFIG. use the regular cache instead. submodules do not inherit that setting, and they don't need to as per comment. also, don't keep adding it to the cache - the cache() function doesn't check whether the added value is already present, so we need to do that manually. amends 31590c0b65. Fixes: QTBUG-63452 Change-Id: I608559a80a7c772dbdaacfaaadb4fc268b442c39 Reviewed-by: Kai Koehne --- qt.pro | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/qt.pro b/qt.pro index 9ce0a694..81553664 100644 --- a/qt.pro +++ b/qt.pro @@ -1,7 +1,13 @@ # Create the super cache so modules will add themselves to it. -# Also suppress the license check on subsequent "visits". The first -# visit will skip it anyway due to not having a compiler set up yet. -cache(CONFIG, add super, $$list(QTDIR_build)) +cache(, super) + +# Suppress the license check on subsequent "visits". The first +# visit will skip it anyway due to not having a compiler set up +# yet. This cannot be added to the super cache, because that is +# read before spec_pre.prf, which flushes CONFIG. This does not +# affect submodules, as they come with a .qmake.conf. But that +# one sets the flag via qt_build_config.prf anyway. +!QTDIR_build: cache(CONFIG, add, $$list(QTDIR_build)) TEMPLATE = subdirs From 7e40cd3a7f108a3c17ebcf115c1b1577a664d950 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joni=20J=C3=A4ntti?= Date: Wed, 17 Oct 2018 12:34:53 +0300 Subject: [PATCH 12/17] Provisioning: macOS_10.13: Update Xcode and cmd line tools to 10.0.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Xcode and command line tools version 10 have been released, we should start building our Qt releases with it, both for iOS and macOS. Installing Xcode 10.0.0 requires OS version update to 10.13.6. A new tier 1 image has been created with the updated OS and this change takes it into use. Task-number: QTQAINFRA-2274 Change-Id: Ida7df234ecfd356b2cb2545ae10cd501dc47197b Reviewed-by: Tor Arne Vestbø Reviewed-by: Tony Sarajärvi Reviewed-by: Qt CI Bot --- coin/platform_configs/default.txt | 8 ++++---- coin/platform_configs/qt3d-runtime.txt | 8 ++++---- coin/platform_configs/qt5.txt | 8 ++++---- coin/provisioning/qtci-macos-10.13-x86_64/20-xcode.sh | 2 +- .../21-install-commandlinetools.sh | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index e5c9c648..8c90b80c 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -13,11 +13,11 @@ qtci-linux-Ubuntu-18.04-x86_64 GCC qtci-linux-openSUSE-42.3-x86_64 GCC DeveloperBuild NoPch qtci-linux-openSUSE-42.3-x86_64 ICC_18 DeveloperBuild NoPch DisableTests SystemSQLite qtci-linux-RHEL-7.4-x86_64 GCC Packaging Release NoUseGoldLinker ForceDebugInfo SeparateDebugInfo -qtci-macos-10.13-x86_64 Clang Packaging DebugAndRelease Release +qtci-macos-10.13-x86_64-2 Clang Packaging DebugAndRelease Release qtci-macos-10.12-x86_64-8 Clang DeveloperBuild NoFramework Release QtNamespace NoPch -qtci-macos-10.13-x86_64 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static -qtci-macos-10.13-x86_64 TvOS_ANY multi Clang DebugAndRelease DisableTests -qtci-macos-10.13-x86_64 WatchOS_ANY multi Clang DebugAndRelease DisableTests +qtci-macos-10.13-x86_64-2 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static +qtci-macos-10.13-x86_64-2 TvOS_ANY multi Clang DebugAndRelease DisableTests +qtci-macos-10.13-x86_64-2 WatchOS_ANY multi Clang DebugAndRelease DisableTests qtci-linux-RHEL-7.4-x86_64 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-RHEL-7.4-x86_64 Android_ANY arm64 Clang Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC Release diff --git a/coin/platform_configs/qt3d-runtime.txt b/coin/platform_configs/qt3d-runtime.txt index 7d0db33a..6abc5ed2 100644 --- a/coin/platform_configs/qt3d-runtime.txt +++ b/coin/platform_configs/qt3d-runtime.txt @@ -10,10 +10,10 @@ qtci-windows-10-x86_64-10 WinRT_10 MSVC2017 qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-windows-7-x86-3 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2 qtci-windows-7-x86-3 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2 -qtci-macos-10.13-x86_64 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2 -qtci-macos-10.13-x86_64 Android_ANY x86 Clang Clang Packaging Release DisableTests OpenGLES2 -qtci-macos-10.13-x86_64 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-macos-10.13-x86_64 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static +qtci-macos-10.13-x86_64-2 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2 +qtci-macos-10.13-x86_64-2 Android_ANY x86 Clang Clang Packaging Release DisableTests OpenGLES2 +qtci-macos-10.13-x86_64-2 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-macos-10.13-x86_64-2 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw73 Packaging Release DisableTests OpenGLES2 qtci-windows-10-x86_64-10 QNX_700 armv8 Mingw73 Packaging Release DisableTests OpenGLES2 qtci-windows-10-x86_64-10 QNX_700 x86_64 Mingw73 Packaging Release DisableTests OpenGLES2 diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 04cce5eb..37065eff 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -11,10 +11,10 @@ qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Clang qtci-windows-7-x86-3 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2 qtci-windows-7-x86-3 Android_ANY arm64 Mingw73 Clang Packaging Release DisableTests OpenGLES2 qtci-windows-7-x86-3 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2 -qtci-macos-10.13-x86_64 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2 -qtci-macos-10.13-x86_64 Android_ANY arm64 Clang Clang Packaging Release DisableTests OpenGLES2 -qtci-macos-10.13-x86_64 Android_ANY x86 Clang Clang Packaging Release DisableTests OpenGLES2 -qtci-macos-10.13-x86_64 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-macos-10.13-x86_64-2 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2 +qtci-macos-10.13-x86_64-2 Android_ANY arm64 Clang Clang Packaging Release DisableTests OpenGLES2 +qtci-macos-10.13-x86_64-2 Android_ANY x86 Clang Clang Packaging Release DisableTests OpenGLES2 +qtci-macos-10.13-x86_64-2 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw73 Packaging Release DisableTests OpenGLES2 qtci-windows-10-x86_64-10 QNX_700 armv8 Mingw73 Packaging Release DisableTests OpenGLES2 qtci-windows-10-x86_64-10 QNX_700 x86_64 Mingw73 Packaging Release DisableTests OpenGLES2 diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/20-xcode.sh b/coin/provisioning/qtci-macos-10.13-x86_64/20-xcode.sh index edcb2345..2aa8713b 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/20-xcode.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/20-xcode.sh @@ -50,4 +50,4 @@ set -ex # shellcheck source=../common/macos/install_xcode.sh source "${BASH_SOURCE%/*}/../common/macos/install_xcode.sh" -InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_9.4.1.tar.gz 9.4.1 +InstallXCode /net/ci-files01-hki.intra.qt.io/hdd/www/input/mac/Xcode_10.tar.gz 10.0.0 diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/21-install-commandlinetools.sh b/coin/provisioning/qtci-macos-10.13-x86_64/21-install-commandlinetools.sh index ecd1bee4..83dd1bec 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/21-install-commandlinetools.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/21-install-commandlinetools.sh @@ -37,10 +37,10 @@ set -ex source "${BASH_SOURCE%/*}/../common/macos/install-commandlinetools.sh" -version="9.4.1" +version="10.0.0" packageName="Command_Line_Tools_macOS_10.13_for_Xcode_$version.dmg" url="http://ci-files01-hki.intra.qt.io/input/mac/macos_10.13_high_sierra/$packageName" -sha1="efe51c11c2c99a5f1a98bbd3772dc3fa3ce78904" +sha1="1d6abe29b8df6397c179b8e2ffbfd0293f1282b0" InstallCommandLineTools $url $url $sha1 $packageName $version From c51cbddc90722e0407581b17058d571b7c59c027 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joni=20J=C3=A4ntti?= Date: Tue, 16 Oct 2018 12:45:59 +0300 Subject: [PATCH 13/17] Provisioning: Windows_7_x86: libclang libclang is required for qdoc. Task-number: QTBUG-69793 Change-Id: I60b54b4338ed6fd3bae99813e268816e063c648a Reviewed-by: Simon Hausmann Reviewed-by: Qt CI Bot --- coin/provisioning/qtci-windows-7-x86/08-libclang.ps1 | 1 + 1 file changed, 1 insertion(+) create mode 100644 coin/provisioning/qtci-windows-7-x86/08-libclang.ps1 diff --git a/coin/provisioning/qtci-windows-7-x86/08-libclang.ps1 b/coin/provisioning/qtci-windows-7-x86/08-libclang.ps1 new file mode 100644 index 00000000..375deed3 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/08-libclang.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\libclang.ps1" 32 mingw From 6de2d1d21143a16bfc8e0a140088815ce6afd2ea Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 18 Oct 2018 20:35:48 +0200 Subject: [PATCH 14/17] Update submodules on '5.12' in qt5 Change-Id: I09368e4171c76cc52110b7778491d512d0d43de1 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qt3d b/qt3d index 17c12d5b..3d75a66c 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 17c12d5b3939b5c67d4c5f68492d1d05792613f7 +Subproject commit 3d75a66c2908faa39d25b55f3d4b8ff3d0c5c4b7 diff --git a/qtbase b/qtbase index 1625e53c..5ac2b9ef 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 1625e53cc8cb24978e6011da148ff223f5c8f35f +Subproject commit 5ac2b9ef5904d8130f6de1ad758b5140784045d4 diff --git a/qtdeclarative b/qtdeclarative index d973907f..878a1772 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit d973907f6e4aae492dfad3eaad6827ffdc49962b +Subproject commit 878a17729b4cdaf0a7989d3e5fe22b058c1715d4 diff --git a/qtmultimedia b/qtmultimedia index 477125de..30cbbd98 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 477125deb6d76f8e0b2a837c00fd99649065a388 +Subproject commit 30cbbd98e7159de08bb71ab4332dbd0bab19eba5 diff --git a/qtqa b/qtqa index 0e82d4f9..184d74f4 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 0e82d4f936ca3cf3186eda6cd074872194e8f8e7 +Subproject commit 184d74f49c9951b1525066091088240a997c6092 diff --git a/qtwayland b/qtwayland index 43d12496..4a328e35 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 43d12496c684b5f2b08c6a8c0b994f06efc25712 +Subproject commit 4a328e3533f93ed65f9dc77f764b3cbe3c694266 diff --git a/qtwebengine b/qtwebengine index c37ba6dc..404201b9 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit c37ba6dce65eadeafda5d18287eef6fedf6d1235 +Subproject commit 404201b9a41564512937a7d96e55d6b095bdcab0 From 97efaacb2befdd0c157598059f40e24cc628b192 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Mon, 15 Oct 2018 12:34:47 +0300 Subject: [PATCH 15/17] Update Android NDK and SDK on Linux envs Task-number: QTBUG-47672 Task-number: QTQAINFRA-2298 Done-with: Liang Qi Change-Id: I42c87d8453423530173b826c09dc6eb4bf9ad5b8 Reviewed-by: Heikki Halmet Reviewed-by: Liang Qi --- .../common/linux/android_linux.sh | 20 +++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index d0fc607e..8ff773a3 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -49,15 +49,15 @@ sdkTargetFolder="$targetFolder/sdk" basePath="http://ci-files01-hki.intra.qt.io/input/android" -toolsVersion="r25.2.5" -toolsFile="tools_$toolsVersion-linux.zip" -ndkVersion="r16b" +toolsVersion="r26.1.1" +toolsFile="sdk-tools-linux-4333796.zip" +ndkVersion="r18b" ndkFile="android-ndk-$ndkVersion-linux-x86_64.zip" -sdkBuildToolsVersion="25.0.2" +sdkBuildToolsVersion="28.0.3" sdkApiLevel="android-21" -toolsSha1="72df3aa1988c0a9003ccdfd7a13a7b8bd0f47fc1" -ndkSha1="42aa43aae89a50d1c66c3f9fdecd676936da6128" +toolsSha1="8c7c28554a32318461802c1291d76fccfafde054" +ndkSha1="500679655da3a86aecf67007e8ab230ea9b4dd7b" toolsTargetFile="/tmp/$toolsFile" toolsSourceFile="$basePath/$toolsFile" @@ -90,6 +90,9 @@ else echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion" fi +echo "Checking the contents of Android SDK..." +ls -l "$sdkTargetFolder" + SetEnvVar "ANDROID_SDK_HOME" "$sdkTargetFolder" SetEnvVar "ANDROID_NDK_HOME" "$targetFolder/android-ndk-$ndkVersion" SetEnvVar "ANDROID_NDK_HOST" "linux-x86_64" @@ -102,7 +105,12 @@ echo "Android SDK API level = $sdkApiLevel" >> ~/versions.txt echo "Android NDK = $ndkVersion" >> ~/versions.txt cd "$sdkTargetFolder/tools/bin" +./sdkmanager --install "emulator" echo "y" | ./sdkmanager --install "system-images;android-21;google_apis;x86" + +echo "Checking the contents of Android SDK again..." +ls -l "$sdkTargetFolder" + echo "no" | ./avdmanager create avd -n x86emulator -k "system-images;android-21;google_apis;x86" -c 2048M -f # Purely informative, show the list of avd devices ./avdmanager list avd From bc5e5baf55641b7b49e7dc4bedc796e2abbcb701 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Tue, 25 Sep 2018 15:02:52 +0300 Subject: [PATCH 16/17] Update Android NDK and SDK on Windows envs Task-number: QTBUG-47672 Change-Id: I3e6526b296f15927b90ab3310d91f8505b0228b3 Reviewed-by: Liang Qi Reviewed-by: Jani Heikkinen --- .../common/windows/android-openssl.ps1 | 8 +- coin/provisioning/common/windows/android.ps1 | 74 ++++++++++--------- 2 files changed, 42 insertions(+), 40 deletions(-) diff --git a/coin/provisioning/common/windows/android-openssl.ps1 b/coin/provisioning/common/windows/android-openssl.ps1 index ccd24cb9..bac88de6 100644 --- a/coin/provisioning/common/windows/android-openssl.ps1 +++ b/coin/provisioning/common/windows/android-openssl.ps1 @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2018 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -53,9 +53,9 @@ Rename-Item C:\Utils\openssl-$version $destination Remove-Item -Path $zip Remove-Item C:\Utils\openssl-$version.tar -Set-EnvironmentVariable "CC" "C:\utils\android-ndk-r16b\toolchains\llvm\prebuilt\linux-x86_64\bin\clang" -Set-EnvironmentVariable "AR" "C:\utils\android-ndk-r16b\toolchains\llvm\prebuilt\linux-x86_64\bin\llvm-ar" -Set-EnvironmentVariable "ANDROID_DEV" "C:\utils\android-ndk-r16b\platforms\android-18\arch-arm\usr" +Set-EnvironmentVariable "CC" "C:\utils\Android\android-ndk-r18b\toolchains\llvm\prebuilt\windows\bin\clang" +Set-EnvironmentVariable "AR" "C:\utils\Android\android-ndk-r18b\toolchains\llvm\prebuilt\windows\bin\llvm-ar" +Set-EnvironmentVariable "ANDROID_DEV" "C:\utils\Android\android-ndk-r18b\platforms\android-21\arch-arm\usr" # Make sure configure for openssl has a "make" and "perl" available $env:PATH = $env:PATH + ";C:\msys\1.0\bin;C:\strawberry\perl\bin" diff --git a/coin/provisioning/common/windows/android.ps1 b/coin/provisioning/common/windows/android.ps1 index f83a8e60..cd98b747 100644 --- a/coin/provisioning/common/windows/android.ps1 +++ b/coin/provisioning/common/windows/android.ps1 @@ -1,6 +1,6 @@ ############################################################################ ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2018 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -40,23 +40,24 @@ # That's why we need to use Andoid-21 API version in Qt 5.9. # NDK -$ndkVersion = "r16b" +$ndkVersion = "r18b" $ndkCachedUrl = "\\ci-files01-hki.intra.qt.io\provisioning\android\android-ndk-$ndkVersion-windows-x86.zip" $ndkOfficialUrl = "https://dl.google.com/android/repository/android-ndk-$ndkVersion-windows-x86.zip" -$ndkChecksum = "becaf3d445a4877ca1a9300a62f0934a4838c7fa" -$ndkFolder = "c:\utils\android-ndk-$ndkVersion" +$ndkChecksum = "4b8b6a4edc0fa967b429c1d6d25adf69acc28803" +$ndkFolder = "c:\Utils\Android\android-ndk-$ndkVersion" $ndkZip = "c:\Windows\Temp\android_ndk_$ndkVersion.zip" # SDK -$sdkVersion = "r24.4.1" +$toolsVersion = "26.1.1" +$toolsFile = "sdk-tools-windows-4333796.zip" $sdkApi = "ANDROID_API_VERSION" $sdkApiLevel = "android-21" -$sdkBuildToolsVersion = "23.0.3" -$sdkCachedUrl= "\\ci-files01-hki.intra.qt.io\provisioning\android\android-sdk_$sdkVersion-windows.zip" -$sdkOfficialUrl = "https://dl.google.com/android/android-sdk_$sdkVersion-windows.zip" -$sdkChecksum = "66b6a6433053c152b22bf8cab19c0f3fef4eba49" -$sdkFolder = "c:\utils\android-sdk-windows" -$sdkZip = "c:\Windows\Temp\android_sdk_$sdkVersion.zip" +$sdkBuildToolsVersion = "28.0.3" +$toolsCachedUrl= "\\ci-files01-hki.intra.qt.io\provisioning\android\$toolsFile" +$toolsOfficialUrl = "https://dl.google.com/android/repository/$toolsFile" +$toolsChecksum = "aa298b5346ee0d63940d13609fe6bec621384510" +$toolsFolder = "c:\Utils\Android\tools" +$sdkZip = "c:\Windows\Temp\$toolsFile" function Install($1, $2, $3, $4) { $cacheUrl = $1 @@ -66,41 +67,42 @@ function Install($1, $2, $3, $4) { Download $offcialUrl $cacheUrl $zip Verify-Checksum $zip "$checksum" - Extract-7Zip $zip C:\Utils + Extract-7Zip $zip C:\Utils\Android } -function SdkUpdate ($1, $2) { - Write-Host "Running Android SDK update for $1..." - cmd /c "echo y |$1\tools\android update sdk --no-ui --all --filter $2" -} - -Write-Host "Installing Android ndk $nkdVersion" +Write-Host "Installing Android NDK $nkdVersion" Install $ndkCachedUrl $ndkZip $ndkChecksum $ndkOfficialUrl Set-EnvironmentVariable "ANDROID_NDK_HOME" $ndkFolder Set-EnvironmentVariable "ANDROID_NDK_ROOT" $ndkFolder -#Write-Host "Installing Android sdk $sdkVersion" -Install $sdkCachedUrl $sdkZip $sdkChecksum $sdkOfficialUrl -Set-EnvironmentVariable "ANDROID_SDK_HOME" $sdkFolder +Install $toolsCachedUrl $sdkZip $toolsChecksum $sdkOfficialUrl +Set-EnvironmentVariable "ANDROID_SDK_HOME" C:\Utils\Android Set-EnvironmentVariable "ANDROID_API_VERSION" $sdkApiLevel -# SDK update -SdkUpdate $sdkFolder $sdkApiLevel -SdkUpdate $sdkFolder tools -SdkUpdate $sdkFolder platform-tools -SdkUpdate $sdkFolder build-tools-$sdkBuildToolsVersion - -# kill adb. This process prevents provisioning to continue -$p = Get-Process -Name "adb" -ErrorAction:SilentlyContinue -if ($p -ne $null) { - Write-Host "Stopping adb.exe" - Stop-Process -Force $p -} else { - Write-Host "adb.exe not running" +if (IsProxyEnabled) { + $proxy = Get-Proxy + Write-Host "Using proxy ($proxy) with sdkmanager" + # Remove "http://" from the beginning + $proxy = $proxy.Remove(0,7) + $proxyhost,$proxyport = $proxy.split(':') + $sdkmanager_args = "--no_https --proxy=http --proxy_host=`"$proxyhost`" --proxy_port=`"$proxyport`" " } -Write-Output "Android SDK tools= $sdkVersion" >> ~/versions.txt +New-Item -ItemType Directory -Force -Path C:\Utils\Android\licenses +$licenseString = "`nd56f5187479451eabf01fb78af6dfcb131a6481e" +Out-File -FilePath C:\Utils\Android\licenses\android-sdk-license -Encoding utf8 -InputObject $licenseString + +# Get a PATH where Java's path is defined from previous provisioning +[Environment]::SetEnvironmentVariable("PATH", [Environment]::GetEnvironmentVariable("PATH", "Machine"), "Process") + +$sdkmanager_args += " platforms;$sdkApiLevel tools platform-tools build-tools;$sdkBuildToolsVersion" +Run-Executable "$toolsFolder\bin\sdkmanager.bat" "$sdkmanager_args" +cd $toolsFolder\bin\ +$command = 'for($i=0;$i -lt 6;$i++) { $response += "y`n"}; $response | .\sdkmanager.bat --licenses' +iex $command +cmd /c "dir C:\Utils\android" + +Write-Output "Android SDK tools= $toolsVersion" >> ~/versions.txt Write-Output "Android SDK Build Tools = $sdkBuildToolsVersion" >> ~/versions.txt Write-Output "Android SDK Api Level = $sdkApiLevel" >> ~/versions.txt Write-Output "Android NDK = $ndkVersion" >> ~/versions.txt - From 4667cfc432a97bf0400c2e4ecf2c1fbd535eae63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Tue, 2 Oct 2018 08:50:31 +0300 Subject: [PATCH 17/17] Update Android NDK and SDK on macOS envs Task-number: QTQAINFRA-2244 Change-Id: I20994bc7a64edefda09da68c4beddde4dc9948aa Reviewed-by: Heikki Halmet Reviewed-by: Liang Qi --- .../qtci-macos-10.13-x86_64/30-android.sh | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh b/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh index a86387bb..717a0767 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh @@ -47,15 +47,15 @@ sdkTargetFolder="$targetFolder/sdk" basePath="/net/ci-files01-hki.intra.qt.io/hdd/www/input/android" -toolsVersion="r25.2.5" -toolsFile="tools_$toolsVersion-macosx.zip" -ndkVersion="r16b" +toolsVersion="r26.1.1" +toolsFile="sdk-tools-darwin-4333796.zip" +ndkVersion="r18b" ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip" -sdkBuildToolsVersion="25.0.2" +sdkBuildToolsVersion="28.0.3" sdkApiLevel="android-21" -toolsSha1="d2168d963ac5b616e3d3ddaf21511d084baf3659" -ndkSha1="e51e615449b98c716cf912057e2682e75d55e2de" +toolsSha1="ed85ea7b59bc3483ce0af4c198523ba044e083ad" +ndkSha1="98cb9909aa8c2dab32db188bbdc3ac6207e09440" toolsTargetFile="/tmp/$toolsFile" toolsSourceFile="$basePath/$toolsFile" @@ -73,6 +73,9 @@ sudo chown -R qt:wheel "$targetFolder" echo "Running SDK manager for platforms;$sdkApiLevel, tools, platform-tools and build-tools;$sdkBuildToolsVersion." (echo "y"; echo "y") |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "tools" "platform-tools" "build-tools;$sdkBuildToolsVersion" +echo "Checking the contents of Android SDK..." +ls -l "$sdkTargetFolder" + SetEnvVar "ANDROID_SDK_HOME" "$sdkTargetFolder" SetEnvVar "ANDROID_NDK_HOME" "$targetFolder/android-ndk-$ndkVersion" SetEnvVar "ANDROID_NDK_HOST" "darwin-x86_64"