From e49e7fc8ad4f29ff35bc0d1b21341737b9036724 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 17 Aug 2018 16:03:52 +0200 Subject: [PATCH 01/16] Adjust submodule branches Change-Id: Ie460cb41d050c1b73e71278469a8231e294db3e3 --- .gitmodules | 80 ++++++++++++++++++++++++++--------------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/.gitmodules b/.gitmodules index 9ac0ec9c..36f130df 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,66 +1,66 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.11 + branch = 5.11.2 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = 5.11 + branch = 5.11.2 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg qtxmlpatterns path = qtdeclarative url = ../qtdeclarative.git - branch = 5.11 + branch = 5.11.2 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = 5.11 + branch = 5.11.2 status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = 5.11 + branch = 5.11.2 status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = 5.11 + branch = 5.11.2 status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt path = qttools url = ../qttools.git - branch = 5.11 + branch = 5.11.2 status = essential [submodule "qtxmlpatterns"] depends = qtbase path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.11 + branch = 5.11.2 status = addon [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = 5.11 + branch = 5.11.2 status = essential priority = 30 [submodule "qtdoc"] depends = qtdeclarative path = qtdoc url = ../qtdoc.git - branch = 5.11 + branch = 5.11.2 status = essential priority = 40 [submodule "qtrepotools"] @@ -81,14 +81,14 @@ recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport path = qtlocation url = ../qtlocation.git - branch = 5.11 + branch = 5.11.2 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = 5.11 + branch = 5.11.2 status = addon [submodule "qtsystems"] depends = qtbase @@ -121,77 +121,77 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = 5.11 + branch = 5.11.2 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = 5.11 + branch = 5.11.2 status = addon [submodule "qt3d"] depends = qtbase recommends = qtdeclarative qtimageformats qtgamepad path = qt3d url = ../qt3d.git - branch = 5.11 + branch = 5.11.2 status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = 5.11 + branch = 5.11.2 status = addon [submodule "qtgraphicaleffects"] depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.11 + branch = 5.11.2 status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.11 + branch = 5.11.2 status = essential [submodule "qtserialbus"] depends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 5.11 + branch = 5.11.2 status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = 5.11 + branch = 5.11.2 status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = 5.11 + branch = 5.11.2 status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = 5.11 + branch = 5.11.2 status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = 5.11 + branch = 5.11.2 status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = 5.11 + branch = 5.11.2 status = addon [submodule "qtenginio"] depends = qtdeclarative @@ -204,108 +204,108 @@ recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = 5.11 + branch = 5.11.2 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = 5.11 + branch = 5.11.2 status = addon [submodule "qtwebengine"] depends = qtquickcontrols qtwebchannel recommends = qtlocation qttools path = qtwebengine url = ../qtwebengine.git - branch = 5.11 + branch = 5.11.2 status = addon priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative path = qtcanvas3d url = ../qtcanvas3d.git - branch = 5.11 + branch = 5.11.2 status = addon [submodule "qtwebview"] depends = qtdeclarative recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = 5.11 + branch = 5.11.2 status = addon [submodule "qtquickcontrols2"] depends = qtgraphicaleffects recommends = qtimageformats path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = 5.11 + branch = 5.11.2 status = addon [submodule "qtpurchasing"] depends = qtbase recommends = qtdeclarative qtandroidextras path = qtpurchasing url = ../qtpurchasing.git - branch = 5.11 + branch = 5.11.2 status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = 5.11 + branch = 5.11.2 status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = 5.11 + branch = 5.11.2 status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = 5.11 + branch = 5.11.2 status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad.git - branch = 5.11 + branch = 5.11.2 status = addon [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml.git - branch = 5.11 + branch = 5.11.2 status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech url = ../qtspeech.git - branch = 5.11 + branch = 5.11.2 status = addon [submodule "qtnetworkauth"] depends = qtbase path = qtnetworkauth url = ../qtnetworkauth.git - branch = 5.11 + branch = 5.11.2 status = addon [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative path = qtremoteobjects url = ../qtremoteobjects.git - branch = 5.11 + branch = 5.11.2 status = preview [submodule "qtwebglplugin"] depends = qtbase qtwebsockets recommends = qtdeclarative path = qtwebglplugin url = ../qtwebglplugin.git - branch = 5.11 + branch = 5.11.2 status = preview From 6c225347aa1a752ead78c4480512cbc6d0f74637 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 20 Aug 2018 16:15:32 +0000 Subject: [PATCH 02/16] Update submodules on '5.11.2' in qt5 Change-Id: I34da23765b048c8e3348d6ac05b18598bfefcd83 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtvirtualkeyboard | 2 +- qtwebengine | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qt3d b/qt3d index ccfe440c..295b16da 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit ccfe440c34479377363679fc890f10b44ee57769 +Subproject commit 295b16da9289bdd261665006b1e5a2284196cb7e diff --git a/qtbase b/qtbase index 29778037..981b16d9 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 29778037f8a7b2c86bc4044409b37d5a51a15432 +Subproject commit 981b16d9ba5a4bb7c6fdc0009fda9a4a74a92f9a diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index bf39468a..d8906c5f 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit bf39468a6368b055335c6b73da65577ec55731ee +Subproject commit d8906c5f36540baef2886e5c6f5b7b4199525f5c diff --git a/qtwebengine b/qtwebengine index e56dd7e3..4bff5a66 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit e56dd7e37ea96c4ba1354e319bdaa9d01c401747 +Subproject commit 4bff5a66084a07c78603c8255126aafcff61177c From 3dd549d61893e085e2eced4a44172b89cad9d47e Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 7 Aug 2018 12:19:06 +0300 Subject: [PATCH 03/16] Provisioning: Fix activate of static linking for libclang MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTBUG-69793 Change-Id: Ib5151e16d0e040a63a3f7fce054f2fad6abb2b6d Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/windows/libclang.ps1 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/common/windows/libclang.ps1 b/coin/provisioning/common/windows/libclang.ps1 index dd21f424..7caecc96 100644 --- a/coin/provisioning/common/windows/libclang.ps1 +++ b/coin/provisioning/common/windows/libclang.ps1 @@ -6,6 +6,7 @@ param( . "$PSScriptRoot\helpers.ps1" $libclang_version="6.0" +Write-Output "libClang = $libclang_version" >> ~/versions.txt # PySide versions following 5.6 use a C++ parser based on Clang (http://clang.org/). # The Clang library (C-bindings), version 3.9 or higher is required for building. @@ -13,6 +14,7 @@ $libclang_version="6.0" # Starting from Qt 5.11 QDoc requires Clang to parse C++ $baseDestination = "C:\Utils\libclang-" + $libclang_version + "-" + $toolchain +$libclang_version = $libclang_version -replace '["."]' function install() { @@ -23,7 +25,6 @@ function install() { $zip = "c:\users\qt\downloads\libclang.7z" - $libclang_version = $libclang_version -replace '["."]' $script:OfficialUrl = "https://download.qt.io/development_releases/prebuilt/libclang/qt/libclang-release_$libclang_version-windows-$toolchain`_$archVer.7z" $script:CachedUrl = "http://ci-files01-hki.intra.qt.io/input/libclang/qt/libclang-release_$libclang_version-windows-$toolchain`_$archVer.7z" @@ -72,7 +73,6 @@ if ( $setDefault ) { Set-EnvironmentVariable "LLVM_INSTALL_DIR" ($baseDestination + "-_ARCH_") } Set-EnvironmentVariable ("LLVM_INSTALL_DIR_" + $toolchainSuffix) ($baseDestination + "-_ARCH_") -Write-Output "libClang = $libclang_version" >> ~/versions.txt if ( $libclang_version -eq "60" ) { # This is a hacked static build of libclang which requires special From 1e9fb7f9d952b3db8935920ff8401efbd1ee6bd4 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Tue, 21 Aug 2018 15:02:07 +0200 Subject: [PATCH 04/16] Prospective fix for build of qttools on Windows with QNX target MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This modules contains qdoc as a host build tool, which needs to be built with MinGW 7.3 as host compiler in order for the libclang linkage to succeed. That linkage is forced via QDOC_USE_STATIC_LIBCLANG, which is set on the Windows 10 machine. Task-number: QTBUG-69793 Change-Id: I2f0ce81c58ae049d9d59559dfe4f457d082cc98d Reviewed-by: Simo Fält --- coin/platform_configs/qt5.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 72ec9b61..7f97f741 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -16,8 +16,8 @@ qtci-macos-10.12-x86_64-8 QNX_700 x86 GCC Release qtci-macos-10.12-x86_64-8 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static qtci-macos-10.12-x86_64-8 TvOS_ANY multi Clang DebugAndRelease DisableTests qtci-macos-10.12-x86_64-8 WatchOS_ANY multi Clang DebugAndRelease DisableTests -qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw53 Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 QNX_700 armv8 Mingw53 Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 QNX_700 x86_64 Mingw53 Packaging Release DisableTests OpenGLES2 +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 cdb1230145a6d7a0f183d26f1ff3a7d4893942f6 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 22 Aug 2018 13:35:54 +0200 Subject: [PATCH 05/16] Manual update of just qttools to pull in libclang build fix Task-number: QTBUG-69793 Change-Id: I9852567a5268be62b45f605bc0e7a0248278c931 Reviewed-by: Simon Hausmann --- qttools | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qttools b/qttools index 6edf6314..58af8597 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 6edf63144df8662bb3ff787553b183584a533f56 +Subproject commit 58af85972b45d905400ba1930b630e77601a2fb0 From 6945c8487cf8ca0a34bc1026b2a810ffc4d40383 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 25 Aug 2018 00:12:42 +0200 Subject: [PATCH 06/16] Update submodules on '5.11.2' in qt5 Change-Id: I63679cff0e7469b9483e521dfa5f59d355e6562e Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qtrepotools | 2 +- qtwebengine | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtbase b/qtbase index 981b16d9..f71048a5 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 981b16d9ba5a4bb7c6fdc0009fda9a4a74a92f9a +Subproject commit f71048a5314c93732a8a77460b465709b632ff5e diff --git a/qtdeclarative b/qtdeclarative index b5016550..028cd30b 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit b50165508996e10a232ee70196a820da06f1af1c +Subproject commit 028cd30b752f296b2c9022db92961016ffb4f7fc diff --git a/qtrepotools b/qtrepotools index 24801f60..ded95025 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 24801f60f05f013f728654d06b35616eec2ef089 +Subproject commit ded9502576543d83ba157eca42515ccd656b25fb diff --git a/qtwebengine b/qtwebengine index 4bff5a66..04ccb412 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 4bff5a66084a07c78603c8255126aafcff61177c +Subproject commit 04ccb412fcbde165fc84f698fb806df69f3ede5e From 32fcfb08cebed8a40b7421c17a23916dbeac4a99 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Thu, 23 Aug 2018 09:57:48 +0300 Subject: [PATCH 07/16] Provisioning: Change jom to use ci-files01-hki as primary url MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This will reduce download time Task-number: QTQAINFRA-2169 Change-Id: If36ac57daa7066cdd97d5d893a105b812e0eee18 Reviewed-by: Joni Jäntti Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/windows/jom.ps1 | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/coin/provisioning/common/windows/jom.ps1 b/coin/provisioning/common/windows/jom.ps1 index 7c59c61c..21993184 100644 --- a/coin/provisioning/common/windows/jom.ps1 +++ b/coin/provisioning/common/windows/jom.ps1 @@ -1,11 +1,13 @@ . "$PSScriptRoot\helpers.ps1" -$zip = Get-DownloadLocation "jom_1_1_2.zip" +$version = "1_1_2" +$zip = Get-DownloadLocation "jom_$version.zip" -Invoke-WebRequest -UseBasicParsing http://download.qt.io/official_releases/jom/jom_1_1_2.zip -OutFile $zip +Download http://download.qt.io/official_releases/jom/jom_$version.zip http://ci-files01-hki.ci.local/input/windows/jom_$version.zip $zip Verify-Checksum $zip "80EE5678E714DE99DDAF5F7593AB04DB1C7928E4" Extract-7Zip $zip C:\Utils\Jom Set-EnvironmentVariable "CI_JOM_PATH" "C:\Utils\Jom" -Write-Output "Jom = 1.1.2" >> ~/versions.txt +$version = $version.replace('_','.') +Write-Output "Jom = $version" >> ~/versions.txt From a2289e9b4ed990255820d28d436a8b4176b90208 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Thu, 23 Aug 2018 09:38:02 +0300 Subject: [PATCH 08/16] Provisioning: Change mesa_llvmpipe to use ci-files01-hki as primary url MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This will reduce download time Task-number: QTQAINFRA-2170 Change-Id: I8313764f7d440e2300a8efabfe4e4226a591d339 Reviewed-by: Joni Jäntti Reviewed-by: Tony Sarajärvi --- .../common/windows/mesa_llvmpipe.ps1 | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/coin/provisioning/common/windows/mesa_llvmpipe.ps1 b/coin/provisioning/common/windows/mesa_llvmpipe.ps1 index 2f613076..ee792896 100644 --- a/coin/provisioning/common/windows/mesa_llvmpipe.ps1 +++ b/coin/provisioning/common/windows/mesa_llvmpipe.ps1 @@ -35,20 +35,21 @@ $version = "11_2_2" $package = "C:\Windows\temp\opengl32sw.7z" $mesaOpenglSha1_64 = "b2ffa5f230a0caa2c2e0bb9a5398bcfb81a0e5d1" -$mesaOpenglUrl_64 = "http://download.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-64-mesa_$version.7z" +$mesaOpenglUrl_64_cache = "http://ci-files01-hki.intra.qt.io/input/windows/opengl32sw-64-mesa_$version.7z" +$mesaOpenglUrl_64_alt = "http://download.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-64-mesa_$version.7z" $mesaOpenglSha1_32 = "e742e9d4e16b9c69b6d844940861d3ef1748356b" -$mesaOpenglUrl_32 = "http://download.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-32-mesa_$version.7z" +$mesaOpenglUrl_32_cache = "http://ci-files01-hki.intra.qt.io/input/windows/opengl32sw-32-mesa_$version.7z" +$mesaOpenglUrl_32_alt = "http://download.qt.io/development_releases/prebuilt/llvmpipe/windows/opengl32sw-32-mesa_$version.7z" function Extract-Mesa { Param ( - [string]$downloadUrl, + [string]$downloadUrlCache, + [string]$downloadUrlAlt, [string]$sha1, [string]$targetFolder ) - Write-Host "Installing Mesa from $downloadUrl to $targetFolder" - Write-Host "Downloading $downloadUrl to $package" - Invoke-WebRequest -UseBasicParsing $downloadUrl -OutFile $package + Download $downloadUrlAlt $downloadUrlCache $package Verify-Checksum $package $sha1 Extract-7Zip $package $targetFolder Write-Host "Removing $package" @@ -56,10 +57,10 @@ function Extract-Mesa } if (Is64BitWinHost) { - Extract-Mesa $mesaOpenglUrl_64 $mesaOpenglSha1_64 "C:\Windows\System32" - Extract-Mesa $mesaOpenglUrl_32 $mesaOpenglSha1_32 "C:\Windows\SysWOW64" + Extract-Mesa $mesaOpenglUrl_64_cache $mesaOpenglUrl_64_alt $mesaOpenglSha1_64 "C:\Windows\System32" + Extract-Mesa $mesaOpenglUrl_32_cache $mesaOpenglUrl_32_alt $mesaOpenglSha1_32 "C:\Windows\SysWOW64" } else { - Extract-Mesa $mesaOpenglUrl_32 $mesaOpenglSha1_32 "C:\Windows\system32" + Extract-Mesa $mesaOpenglUrl_32_cache $mesaOpenglUrl_32_alt $mesaOpenglSha1_32 "C:\Windows\system32" } Write-Output "Mesa llvmpipe = $version" >> ~/versions.txt From f70c304b5e132e12574a2f08fdd2ab9552275190 Mon Sep 17 00:00:00 2001 From: Antti Kokko Date: Fri, 24 Aug 2018 11:38:09 +0300 Subject: [PATCH 09/16] Add qt3d-runtime targets MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QT3DS-2126 Change-Id: Ibce83cbd513bc0083ac149ed453fc9eb217c1d7a Reviewed-by: Simo Fält Reviewed-by: Laszlo Agocs --- coin/platform_configs/qt3d-runtime.txt | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 coin/platform_configs/qt3d-runtime.txt diff --git a/coin/platform_configs/qt3d-runtime.txt b/coin/platform_configs/qt3d-runtime.txt new file mode 100644 index 00000000..91f3cabe --- /dev/null +++ b/coin/platform_configs/qt3d-runtime.txt @@ -0,0 +1,19 @@ +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 Mingw53 Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-10 QNX_700 armv8 Mingw53 Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-10 QNX_700 x86_64 Mingw53 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 cd9b6276b8b8d723a6be83ee85483d700397da64 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 28 Aug 2018 09:08:19 +0300 Subject: [PATCH 10/16] Provisioning: Disable Cracklib-runtime MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-2104 Change-Id: I784fa1b3d8c98d765bfdea929fdb494ca63e09d3 Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/linux/disable-cracklib.sh | 4 ++++ .../qtci-linux-Ubuntu-16.04-x86/01-disable-cracklib.sh | 4 ++++ .../qtci-linux-Ubuntu-16.04-x86_64/01-disable-cracklib.sh | 4 ++++ 3 files changed, 12 insertions(+) create mode 100755 coin/provisioning/common/linux/disable-cracklib.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-16.04-x86/01-disable-cracklib.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-disable-cracklib.sh diff --git a/coin/provisioning/common/linux/disable-cracklib.sh b/coin/provisioning/common/linux/disable-cracklib.sh new file mode 100755 index 00000000..e6cfc7a5 --- /dev/null +++ b/coin/provisioning/common/linux/disable-cracklib.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +sudo chmod -x /etc/cron.daily/cracklib-runtime + diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/01-disable-cracklib.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/01-disable-cracklib.sh new file mode 100755 index 00000000..8590d4e4 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/01-disable-cracklib.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +# shellcheck source=../common/linux/disable-cracklib.sh +source "${BASH_SOURCE%/*}/../common/linux/disable-cracklib.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-disable-cracklib.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-disable-cracklib.sh new file mode 100755 index 00000000..8590d4e4 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-disable-cracklib.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +# shellcheck source=../common/linux/disable-cracklib.sh +source "${BASH_SOURCE%/*}/../common/linux/disable-cracklib.sh" From 967129344a5871b72d862844b1c2c56942b3cd3e Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Mon, 27 Aug 2018 15:38:07 +0300 Subject: [PATCH 11/16] Provisioning: Remove update-manager MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-2104 Change-Id: Ieaf0801099d8c90821c2b8d9db7da47730fd8abb Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/linux/remove_update-manager.sh | 3 +++ .../qtci-linux-Ubuntu-16.04-x86/01-remove_update-manager | 4 ++++ .../qtci-linux-Ubuntu-16.04-x86_64/01-remove_update-manager | 4 ++++ 3 files changed, 11 insertions(+) create mode 100755 coin/provisioning/common/linux/remove_update-manager.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-16.04-x86/01-remove_update-manager create mode 100755 coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-remove_update-manager diff --git a/coin/provisioning/common/linux/remove_update-manager.sh b/coin/provisioning/common/linux/remove_update-manager.sh new file mode 100755 index 00000000..d5dc1ca4 --- /dev/null +++ b/coin/provisioning/common/linux/remove_update-manager.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +sudo apt-get remove update-manager diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/01-remove_update-manager b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/01-remove_update-manager new file mode 100755 index 00000000..12302976 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/01-remove_update-manager @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +# shellcheck source=../common/linux/remove_update-manager.sh +source "${BASH_SOURCE%/*}/../common/linux/remove_update-manager.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-remove_update-manager b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-remove_update-manager new file mode 100755 index 00000000..12302976 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-remove_update-manager @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +# shellcheck source=../common/linux/remove_update-manager.sh +source "${BASH_SOURCE%/*}/../common/linux/remove_update-manager.sh" From c870b9b13f64876efbb867575e3c5699c5fabd8d Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 27 Jun 2018 15:32:21 +0300 Subject: [PATCH 12/16] Provisioning: Disable mlocate from linux MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit No need to update the locate database Task-number: QTQAINFRA-2099 Change-Id: Iae8bf26e4b04ff9c287e9e3f4cc6f492e74355e4 Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/linux/disable-mlocate.sh | 3 +++ .../qtci-linux-RHEL-6.6-x86_64/01-disable-mlocate.sh | 4 ++++ .../qtci-linux-RHEL-7.4-x86_64/01-disable-mlocate.sh | 4 ++++ .../qtci-linux-Ubuntu-16.04-x86/01-disable-mlocate.sh | 4 ++++ .../qtci-linux-Ubuntu-16.04-x86_64/01-disable-mlocate.sh | 4 ++++ 5 files changed, 19 insertions(+) create mode 100755 coin/provisioning/common/linux/disable-mlocate.sh create mode 100755 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-disable-mlocate.sh create mode 100755 coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-disable-mlocate.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-16.04-x86/01-disable-mlocate.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-disable-mlocate.sh diff --git a/coin/provisioning/common/linux/disable-mlocate.sh b/coin/provisioning/common/linux/disable-mlocate.sh new file mode 100755 index 00000000..c86df437 --- /dev/null +++ b/coin/provisioning/common/linux/disable-mlocate.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +sudo chmod -x /etc/cron.daily/mlocate* diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-disable-mlocate.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-disable-mlocate.sh new file mode 100755 index 00000000..f12cff1e --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-disable-mlocate.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +BASEDIR=$(dirname "$0") +# shellcheck source=../common/linux/disable-mlocate.sh +"$BASEDIR/../common/linux/disable-mlocate.sh" diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-disable-mlocate.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-disable-mlocate.sh new file mode 100755 index 00000000..f12cff1e --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-disable-mlocate.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +BASEDIR=$(dirname "$0") +# shellcheck source=../common/linux/disable-mlocate.sh +"$BASEDIR/../common/linux/disable-mlocate.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/01-disable-mlocate.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/01-disable-mlocate.sh new file mode 100755 index 00000000..f12cff1e --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/01-disable-mlocate.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +BASEDIR=$(dirname "$0") +# shellcheck source=../common/linux/disable-mlocate.sh +"$BASEDIR/../common/linux/disable-mlocate.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-disable-mlocate.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-disable-mlocate.sh new file mode 100755 index 00000000..f12cff1e --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-disable-mlocate.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +BASEDIR=$(dirname "$0") +# shellcheck source=../common/linux/disable-mlocate.sh +"$BASEDIR/../common/linux/disable-mlocate.sh" From c478262c265e1b9d70306f6868645156f41484cc Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Mon, 3 Sep 2018 15:17:51 +0200 Subject: [PATCH 13/16] Update submodules on '5.11.2' in qt5 Change-Id: Iebe3db08c265da0185b58c67aeae3765f8eb5616 Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtquickcontrols | 2 +- qtrepotools | 2 +- qtscript | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 37 files changed, 37 insertions(+), 37 deletions(-) diff --git a/qt3d b/qt3d index 295b16da..d0692c69 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 295b16da9289bdd261665006b1e5a2284196cb7e +Subproject commit d0692c6944599a5561ea07faaa6bddf98e7e2a6e diff --git a/qtactiveqt b/qtactiveqt index b09610e1..a3d89c22 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit b09610e10592af6224b64507f1d6d209d4baf6c9 +Subproject commit a3d89c22c43ee949ce7d60736344f04ed11b55fa diff --git a/qtandroidextras b/qtandroidextras index 82fc3412..e5e4b82d 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 82fc3412c648d17ce99aecf7b46b273f72a4dbda +Subproject commit e5e4b82d5840d2c84da05faea8881dd4a5bb2a46 diff --git a/qtbase b/qtbase index f71048a5..4e405746 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit f71048a5314c93732a8a77460b465709b632ff5e +Subproject commit 4e4057460a0b27e4a8eff749fb284f61f245982e diff --git a/qtcanvas3d b/qtcanvas3d index c8ca99e2..f1a2bd81 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit c8ca99e24e6ec57d961050ebe31da2109208c720 +Subproject commit f1a2bd81052802a2a762051066b724f1444df3ed diff --git a/qtcharts b/qtcharts index cf3255b1..29cfc986 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit cf3255b18b488c7bb1802a9447f7b0ed0a2a4434 +Subproject commit 29cfc9869349b83227452adc021273cde5857c91 diff --git a/qtconnectivity b/qtconnectivity index 72a48c7d..8b70dcb2 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 72a48c7d108e1f3faaab0a03c6d2a6ead16d2bcc +Subproject commit 8b70dcb210d82a55220c0a953653646a91d55251 diff --git a/qtdatavis3d b/qtdatavis3d index d4ef709d..2927c250 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit d4ef709d16b6a22ee024069c19aba2a9311f8f9d +Subproject commit 2927c2509a2907be505a94600485d5e83c89431b diff --git a/qtdeclarative b/qtdeclarative index 028cd30b..72cc53b5 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 028cd30b752f296b2c9022db92961016ffb4f7fc +Subproject commit 72cc53b5ee8bd6821d0094ad0c5c45d7a269f943 diff --git a/qtdoc b/qtdoc index 95f0ad63..6ba9b52d 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 95f0ad632ba1551974d4eacbd9ae08012a460e46 +Subproject commit 6ba9b52d99826fa639c2a339e0d6396a6ed87a30 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 76191bb1..43d951c8 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 76191bb1df602aa4a2bf99a3a0b21bb081a52693 +Subproject commit 43d951c802f348c61ede03059c38bcb262e9e7f7 diff --git a/qtimageformats b/qtimageformats index 55904e96..529f5854 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 55904e9671f4e927308a78d217c0069528ba7f49 +Subproject commit 529f5854c1bba36befba984b1a066d3b77689f12 diff --git a/qtlocation b/qtlocation index 571126c3..6d56b229 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 571126c3d63f899a67b896886aaec8cf4f0acb1c +Subproject commit 6d56b2295f377df4b7fc19543a496fa22b30c7d9 diff --git a/qtmacextras b/qtmacextras index 61df18da..68878dfa 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 61df18dac61bab1bc9fbc971ac9a6107734e2ee8 +Subproject commit 68878dfa38f3b5c099fccf71828207712570fdbf diff --git a/qtmultimedia b/qtmultimedia index b799d36a..320a109d 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit b799d36a9e543bccd921399e929ef7ad17f15497 +Subproject commit 320a109d19a515eec370761c8ccb0a83d4e1de2f diff --git a/qtnetworkauth b/qtnetworkauth index c47f2735..d17cc152 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit c47f273569fd389ab86e75749166a953f015ecb9 +Subproject commit d17cc152085f664c9e8a381d6be18af42c619108 diff --git a/qtpurchasing b/qtpurchasing index b888333a..cfeaf0be 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit b888333a425e3a5d52c06e9891440b7c056bdca6 +Subproject commit cfeaf0be6c7869b15c87b83632be7eeebf76e0f9 diff --git a/qtquickcontrols b/qtquickcontrols index 4f5b04a5..6ffa877a 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 4f5b04a5f6376b3b29e37abb6301cc1bdab5af83 +Subproject commit 6ffa877a646e694743173d381e8bd1d2c9d45d68 diff --git a/qtrepotools b/qtrepotools index ded95025..f18687e4 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit ded9502576543d83ba157eca42515ccd656b25fb +Subproject commit f18687e44b0ea151ab65ac2dacbd752295fc1b03 diff --git a/qtscript b/qtscript index 2e67664e..b5f10e49 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 2e67664efc66e2f96eb8c6859bef6d6a4160bade +Subproject commit b5f10e499754d57bde490f663a1edf63b4e1bcdc diff --git a/qtscxml b/qtscxml index 806eae6e..9cfd49db 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 806eae6ed05ba114cdf1d35aa2b0855ebfb5d15b +Subproject commit 9cfd49dbb3b6a3a173dff4d83129bf96fdcea609 diff --git a/qtsensors b/qtsensors index a2d3d45f..b4634741 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit a2d3d45f3e9f779a4fc10f8df07b9bd921e755c6 +Subproject commit b4634741fd94dac837418fd5e4f6e1c75bb29a22 diff --git a/qtserialbus b/qtserialbus index 23a4f70d..e9680f77 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 23a4f70d26ac2c74e695a0138eb1d766918973bb +Subproject commit e9680f774fcd018842414734d1a6544ec366bf78 diff --git a/qtserialport b/qtserialport index e0bd3949..d8a92d2c 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit e0bd3949c30ce9c1988a6d6a3c0850d16a1fb33a +Subproject commit d8a92d2ca965f5a9afccba0fb7b7f49d026820d4 diff --git a/qtspeech b/qtspeech index 34a26b67..7d90f5df 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 34a26b6773f1d9a5592ecb02e08209a0b74fa92f +Subproject commit 7d90f5dfa734a83221fe78140bb9c7d6ff4d3879 diff --git a/qtsvg b/qtsvg index 1262e6dc..6ddd60fe 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 1262e6dc979d0624307897980be27b8310fe34a0 +Subproject commit 6ddd60feae4f05ddf179f879b168656538ddb2ef diff --git a/qttools b/qttools index 58af8597..dc5fdf37 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 58af85972b45d905400ba1930b630e77601a2fb0 +Subproject commit dc5fdf373ea90b92a86778d6dd4a821ddd059ba2 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index d8906c5f..c8f5d466 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit d8906c5f36540baef2886e5c6f5b7b4199525f5c +Subproject commit c8f5d466bcda37174a3f3d5acbf4db2eb9c29bb1 diff --git a/qtwayland b/qtwayland index b5dfc03a..048fa7f5 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit b5dfc03a13014bf29d23784bc6802bb06e212558 +Subproject commit 048fa7f52cbfee1351e5c2d6420f438fa733106e diff --git a/qtwebchannel b/qtwebchannel index 1906f624..b4277bf9 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 1906f62469e608f712c1507dabd74638e38d8075 +Subproject commit b4277bf9bf30f1fc8cba1d6c7185e991e83e6e18 diff --git a/qtwebengine b/qtwebengine index 04ccb412..6615f661 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 04ccb412fcbde165fc84f698fb806df69f3ede5e +Subproject commit 6615f6617922fb67daac1738a6d0a7237382060f diff --git a/qtwebglplugin b/qtwebglplugin index e87065b1..4f1c8aa8 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit e87065b17b9797aaeb0405a9c4b6191d1745d505 +Subproject commit 4f1c8aa8fcc60ca7eef5f92d4e920b065336ffd0 diff --git a/qtwebsockets b/qtwebsockets index cf41cd16..10ce467a 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit cf41cd16a1f156d68f9cb4a84dd77230f29d739f +Subproject commit 10ce467a825f2de5a5cb934c4ef21e76f8840a07 diff --git a/qtwebview b/qtwebview index c95d904f..4c1918c9 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit c95d904fa11b925a1617e4b5b2a87915079d8642 +Subproject commit 4c1918c99db5bcb3c95e777df2f6886f46b0336b diff --git a/qtwinextras b/qtwinextras index da2c3338..afd470bd 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit da2c33386d4c55638c5d2d797ea416562e98d3cb +Subproject commit afd470bdcc7579fb1479695974d9d7cb583ae57c diff --git a/qtx11extras b/qtx11extras index acebfcd6..131aa903 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit acebfcd63f34123e9a57d4ab76526eb0dd8cefff +Subproject commit 131aa9037dd93595473bc7277123fbc3360ae15b diff --git a/qtxmlpatterns b/qtxmlpatterns index dbc1311a..bb3d518f 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit dbc1311af757c5acdca034d3632dca3bf1f81af5 +Subproject commit bb3d518fea63cc834fe2b5654c3ac8bf7d2771f6 From 040ca5e26740d28d59cad4f231806eda89ac3329 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 4 Sep 2018 10:54:31 +0200 Subject: [PATCH 14/16] Update submodules on '5.11.2' in qt5 Change-Id: If055dba4544826db368e5d46bb8d6b622e08d892 Reviewed-by: Liang Qi --- qtbase | 2 +- qtquickcontrols2 | 2 +- qtrepotools | 2 +- qttools | 2 +- qtwebchannel | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qtbase b/qtbase index 4e405746..9da5b6f7 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 4e4057460a0b27e4a8eff749fb284f61f245982e +Subproject commit 9da5b6f7432dc1d87cec94040ede69cb2f7ff537 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 1876c17c..4ba4b944 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 1876c17c354cf60160f408950bb6e5cc4a4f879e +Subproject commit 4ba4b944686f3b2314dd26a56180d56c04d8b5bb diff --git a/qtrepotools b/qtrepotools index f18687e4..ddd8ad86 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit f18687e44b0ea151ab65ac2dacbd752295fc1b03 +Subproject commit ddd8ad86da7790ce83640814ee5f1528c4df1fbe diff --git a/qttools b/qttools index dc5fdf37..277af207 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit dc5fdf373ea90b92a86778d6dd4a821ddd059ba2 +Subproject commit 277af20762813ff92ea47a69b4d18563e01cc18e diff --git a/qtwebchannel b/qtwebchannel index b4277bf9..3994950f 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit b4277bf9bf30f1fc8cba1d6c7185e991e83e6e18 +Subproject commit 3994950f0d0065a4579b6bfe738702a6daeead96 From daae11c62b5a193bf08991c430724cb74d997b1c Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 6 Sep 2018 07:21:47 +0000 Subject: [PATCH 15/16] Update submodules on '5.11.2' in qt5 Change-Id: If0f3dc30be6ad8e10d81c0b8861c9523a07c0894 Reviewed-by: Jani Heikkinen --- qt3d | 2 +- qtgamepad | 2 +- qtremoteobjects | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qt3d b/qt3d index d0692c69..d630e3c8 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit d0692c6944599a5561ea07faaa6bddf98e7e2a6e +Subproject commit d630e3c8a9ac291421f028873bd599f7a072dd65 diff --git a/qtgamepad b/qtgamepad index 7d1b726d..4bac917d 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 7d1b726d0c338162be5e388bc594a52714d20f18 +Subproject commit 4bac917db87046017485a4758d4b9d8e6a50528b diff --git a/qtremoteobjects b/qtremoteobjects index d292f1d9..fc13d3db 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit d292f1d93ffef611a0a6e9f393251785e1e9b779 +Subproject commit fc13d3dbe5570d689f1bb84094a340096da721db diff --git a/qtwayland b/qtwayland index 048fa7f5..0a6e1ddf 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 048fa7f52cbfee1351e5c2d6420f438fa733106e +Subproject commit 0a6e1ddf708c47b3d19c1418630076e14021e49c diff --git a/qtwebengine b/qtwebengine index 6615f661..6426f1e9 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 6615f6617922fb67daac1738a6d0a7237382060f +Subproject commit 6426f1e93622cb08a2286705398e7762cbcd0a45 From 6a919fb8f54bba0dce3223cc240c796c4c8ac1f6 Mon Sep 17 00:00:00 2001 From: Antti Kokko Date: Thu, 6 Sep 2018 08:47:40 +0300 Subject: [PATCH 16/16] Use MinGW73 for building Qt3D runtime QNX targets MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I0fc650345dcffe8840f440db74cf4d9d48465bf9 Reviewed-by: Simo Fält Reviewed-by: Akseli Salovaara --- coin/platform_configs/qt3d-runtime.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/coin/platform_configs/qt3d-runtime.txt b/coin/platform_configs/qt3d-runtime.txt index 91f3cabe..396b51dc 100644 --- a/coin/platform_configs/qt3d-runtime.txt +++ b/coin/platform_configs/qt3d-runtime.txt @@ -12,8 +12,8 @@ qtci-windows-7-x86-3 Android_ANY x86 Mingw53 Packagin 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 Mingw53 Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 QNX_700 armv8 Mingw53 Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 QNX_700 x86_64 Mingw53 Packaging Release DisableTests OpenGLES2 +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