From e49e7fc8ad4f29ff35bc0d1b21341737b9036724 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Fri, 17 Aug 2018 16:03:52 +0200 Subject: [PATCH 01/36] 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/36] 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/36] 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/36] 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/36] 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/36] 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/36] 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/36] 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/36] 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 5872e22f31507524f7bfc3d03e8b8723ed66d277 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Tue, 28 Aug 2018 11:11:24 +0200 Subject: [PATCH 10/36] _clang-format: indent initializers with four spaces, not eight MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I9fc644554bd326a3a54163072b7b9e06253a5ff2 Reviewed-by: Tor Arne Vestbø Reviewed-by: Paul Wicking --- _clang-format | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/_clang-format b/_clang-format index c2e09757..ee000a1e 100644 --- a/_clang-format +++ b/_clang-format @@ -49,8 +49,8 @@ BraceWrapping: # When constructor initializers do not fit on one line, put them each on a new line. ConstructorInitializerAllOnOneLineOrOnePerLine: true -# Indent initializers by 8 spaces -ConstructorInitializerIndentWidth: 8 +# Indent initializers by 4 spaces +ConstructorInitializerIndentWidth: 4 # Indent width for line continuations. ContinuationIndentWidth: 8 From 8b4d267af7f77c0d28150f7f4978872507e1bf4d Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Thu, 30 Aug 2018 17:34:15 +0200 Subject: [PATCH 11/36] Add Fixes: tag to commit template Change-Id: I2ad6829901be73bd18a8785c2bee3acd3ba20bcc Reviewed-by: Shawn Rutledge Reviewed-by: Lars Knoll --- .commit-template | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/.commit-template b/.commit-template index aced2afa..3a288707 100644 --- a/.commit-template +++ b/.commit-template @@ -9,7 +9,11 @@ # ==[ Footers: Uncomment and edit where applicable ]===================| # -# One task per entry. Remember space after colon. +# One task per entry. Add a space after the colon. +# Use Fixes to automatically close an issue, and Task-number to +# reference it without further action. +# You do not need both for the same issue. +#Fixes: #Task-number: #Coverity-Id: # From cd9b6276b8b8d723a6be83ee85483d700397da64 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 28 Aug 2018 09:08:19 +0300 Subject: [PATCH 12/36] 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 13/36] 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 14/36] 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 15/36] 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 b9b8066d97ccf0bbfd6ae6ec0fcac97ff9a955ce Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 3 Sep 2018 23:30:46 +0200 Subject: [PATCH 16/36] Update submodules on '5.11' in qt5 Change-Id: I89b673b1078c0ffab7e4710b2718008c46127bad Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtconnectivity | 2 +- qtmultimedia | 2 +- qtquickcontrols2 | 2 +- qtrepotools | 2 +- qttools | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qtbase b/qtbase index bd42e2f0..ff2a71e3 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit bd42e2f0cebb2fe8de77a054e9d30aa803749a61 +Subproject commit ff2a71e310b18a43a41daf2d197f5715f7c26d29 diff --git a/qtconnectivity b/qtconnectivity index 0c2b6dc4..77186711 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 0c2b6dc44351352e8a88248b98e1d45c0403e01c +Subproject commit 771867113c7d531f576768652a40c5cf53d9e57f diff --git a/qtmultimedia b/qtmultimedia index c1ca9510..f844a2ac 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit c1ca9510af3c3c4134b717f1863651783e338a9e +Subproject commit f844a2acbb7ecc4d7b1776d1d6eeb8feab7044f1 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 1876c17c..65374a95 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 1876c17c354cf60160f408950bb6e5cc4a4f879e +Subproject commit 65374a95a33a677740f6e6b25c424b4a4b466b3f 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/qttools b/qttools index 6edf6314..a2a0ff86 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 6edf63144df8662bb3ff787553b183584a533f56 +Subproject commit a2a0ff8676bce46ed1ae7c387cbcd2f5377a0e01 From 72505cc55bd3f8031623e7df198a005ab5fa28b7 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 4 Sep 2018 23:30:39 +0200 Subject: [PATCH 17/36] Update submodules on '5.11' in qt5 Change-Id: I35ae3d03cfa8f5dd202218ffb7d2f0057eb41660 Reviewed-by: Qt Submodule Update Bot --- qtrepotools | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtrepotools b/qtrepotools index f18687e4..ddd8ad86 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit f18687e44b0ea151ab65ac2dacbd752295fc1b03 +Subproject commit ddd8ad86da7790ce83640814ee5f1528c4df1fbe 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 18/36] 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 19/36] 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 20/36] 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 From d6a82a8416a85d80d8e6a12b650f9539fd5dacae Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 6 Sep 2018 20:11:47 +0200 Subject: [PATCH 21/36] Update submodules on '5.12' in qt5 Change-Id: Ica545d4ea4639924b24dd6d75ff614075879955d Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtxmlpatterns | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qt3d b/qt3d index 27457f50..ed7e50c8 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 27457f50b35b3941db4e7e5def742fcdefe218ff +Subproject commit ed7e50c8518f8d385b22a8f587d860f7d49d1ecc diff --git a/qtbase b/qtbase index 42a68ee9..deab54f8 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 42a68ee9dd53eac2d8aaabf02dcf4ffa4525facf +Subproject commit deab54f84f5771755c714e52b4587f152de09446 diff --git a/qtconnectivity b/qtconnectivity index 68475e56..a1e00ab1 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 68475e563d8a19f521278703a3e98c7664d6bbbc +Subproject commit a1e00ab195e879724efb0c03be8c06ddb6799fac diff --git a/qtdeclarative b/qtdeclarative index a7472867..93210011 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit a7472867f407f1226d82aa7bce4cd4d6f9bd652f +Subproject commit 932100115bfd4d0ad5a3d8dad03c7af3b393a8b6 diff --git a/qtlocation b/qtlocation index 3bd2541f..299b22f7 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 3bd2541f84be5200a54c7565074ea22992397c79 +Subproject commit 299b22f70fb2ae89171d456b062c4f2dd3e9339d diff --git a/qtmultimedia b/qtmultimedia index 35ace9e2..871a097d 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 35ace9e289dcaada5e0828a59ca7dfee78a6342c +Subproject commit 871a097d0c6e8203f82b398e21dcfd8151bdae27 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index d19f782a..1bcab29e 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit d19f782a887e4a8c87ceee42ad8405a0b12388d0 +Subproject commit 1bcab29ef7a4f7913c4bc29e00bf1ad23adc440f diff --git a/qtremoteobjects b/qtremoteobjects index 854217d6..e43c9fe0 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 854217d60da9ab54795fb39896a053f301222848 +Subproject commit e43c9fe03e6ff6849f43117c384c083c4bf8ff1d diff --git a/qttools b/qttools index 53094d90..aac2b1cd 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 53094d904447abf2c720dbec1bf8d6e63d53af14 +Subproject commit aac2b1cdbb4003fd8427be628d33c7e2f6d66aaa diff --git a/qtwayland b/qtwayland index 192b2e8f..88a30a8f 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 192b2e8f59e7f0cb3c2d482524bf171a81a213c5 +Subproject commit 88a30a8fe059f758190b73ea6c2c13bb70df07a6 diff --git a/qtwebengine b/qtwebengine index 1fde9178..80e2c7a4 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 1fde91789de573683eaf1d6b1294eba7757ce11b +Subproject commit 80e2c7a47b51a09247c86b220be4abcf298e3f69 diff --git a/qtxmlpatterns b/qtxmlpatterns index 8c6e2432..99490652 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 8c6e24329ecd65f364654b1ca2b6a273f0826a8b +Subproject commit 9949065280674cf06a6a9670c1100d9ab8156df6 From bf0b84a051dabbcd87de09e25ee050cd72fe8f27 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 6 Sep 2018 20:14:13 +0200 Subject: [PATCH 22/36] Update submodules on '5.11' in qt5 Change-Id: Ie1bf232eae589efe512178d158aef2f3c09a2b7c Reviewed-by: Liang Qi --- qtbase | 2 +- qtmultimedia | 2 +- qtquickcontrols2 | 2 +- qtsensors | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qtbase b/qtbase index ff2a71e3..3bac18da 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit ff2a71e310b18a43a41daf2d197f5715f7c26d29 +Subproject commit 3bac18da8ef9f5750207ddf47192b5db3137c4ac diff --git a/qtmultimedia b/qtmultimedia index f844a2ac..c5400d31 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit f844a2acbb7ecc4d7b1776d1d6eeb8feab7044f1 +Subproject commit c5400d31a40847e2905b11759090400653624a94 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 65374a95..d5cb26bc 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 65374a95a33a677740f6e6b25c424b4a4b466b3f +Subproject commit d5cb26bc56a3b6f6e99c88654d4f7a65f43551ac diff --git a/qtsensors b/qtsensors index a2d3d45f..4ab2e8f0 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit a2d3d45f3e9f779a4fc10f8df07b9bd921e755c6 +Subproject commit 4ab2e8f086441c06a2dabbd4c62756fc0f029053 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 30479f97..c40e19e8 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 30479f9771e60938dc0f6e325e3b16fb52663796 +Subproject commit c40e19e8012788522806f25589d7c41d93d423b4 diff --git a/qtwayland b/qtwayland index 53dff95b..c3b6c4d4 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 53dff95bfbe9070c4cd17045f3d5147f29710c5f +Subproject commit c3b6c4d442c8187e43601c548bc58ce3e4fe21f3 diff --git a/qtwebengine b/qtwebengine index dab4814d..d4ef262a 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit dab4814dc4187db345a53b234c4cdd4cbdcf4bce +Subproject commit d4ef262a9e84f73c7bd211c843b8094eb4863a17 From 3a5feff2a247114ccebf79081f6f171ea7774950 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 7 Sep 2018 12:55:01 +0200 Subject: [PATCH 23/36] Update submodules on '5.12' in qt5 Change-Id: I84ed5c723c9c3bef9f509a30502b93af2dde844b Reviewed-by: Liang Qi --- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtquickcontrols2 | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qtbase b/qtbase index deab54f8..295cd87c 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit deab54f84f5771755c714e52b4587f152de09446 +Subproject commit 295cd87c6d4cb6c9c1222fc565031377e5f33704 diff --git a/qtconnectivity b/qtconnectivity index a1e00ab1..c77d7bb1 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit a1e00ab195e879724efb0c03be8c06ddb6799fac +Subproject commit c77d7bb17e9b0174abc045f73430291710acfc3c diff --git a/qtdeclarative b/qtdeclarative index 93210011..d71df8db 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 932100115bfd4d0ad5a3d8dad03c7af3b393a8b6 +Subproject commit d71df8db162ff8b4d6bd1833c088024b8870b02c diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 1bcab29e..7e38097f 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 1bcab29ef7a4f7913c4bc29e00bf1ad23adc440f +Subproject commit 7e38097fb03b1b304a90630b475fe1f771a44d4e diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index a046dd2d..3adc25c8 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit a046dd2d5486e4805481fd360e486f869d0fa36d +Subproject commit 3adc25c8b2105418f86d0c6390832e887d483cc0 diff --git a/qtwayland b/qtwayland index 88a30a8f..8b62fafc 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 88a30a8fe059f758190b73ea6c2c13bb70df07a6 +Subproject commit 8b62fafcbe3ec5c1b50d9c3845b5ac961c9c3e87 diff --git a/qtwebengine b/qtwebengine index 80e2c7a4..964b882c 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 80e2c7a47b51a09247c86b220be4abcf298e3f69 +Subproject commit 964b882c0817b2dc8ebd631658b4faac926b0145 From d038865e6523b91d8159436adf665eb17ecaea94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Tue, 4 Sep 2018 12:19:13 +0300 Subject: [PATCH 24/36] Fix license text of provisioning script Change-Id: I542da038dd087b1705d1ceb475a1656eeec84c91 Reviewed-by: Maurice Kalinowski Reviewed-by: Liang Qi --- .../qtci-linux-Ubuntu-18.04-x86_64/22-mqtt_broker.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/22-mqtt_broker.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/22-mqtt_broker.sh index 97b546f2..4527e984 100644 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/22-mqtt_broker.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/22-mqtt_broker.sh @@ -5,7 +5,7 @@ ## Copyright (C) 2018 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## -## This file is part of the test suite of the Qt Toolkit. +## This file is part of the provisioning scripts of the Qt Toolkit. ## ## $QT_BEGIN_LICENSE:LGPL21$ ## Commercial License Usage From e95824f59e688963a7a5dff4dc214d8a5c829e9f Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 9 Sep 2018 21:53:24 +0200 Subject: [PATCH 25/36] Update submodules on '5.11' in qt5 Change-Id: I15c5af9f1985ad113fd63c3366bd7f4d8612e4af Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 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 +- 38 files changed, 38 insertions(+), 38 deletions(-) diff --git a/qt3d b/qt3d index 42a466e0..03253bab 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 42a466e0c77e4ef209a51bfa04ee6ca2bcae99a4 +Subproject commit 03253babc2077795eca2decfd8b9d6310f49ce93 diff --git a/qtactiveqt b/qtactiveqt index b09610e1..df7a2c1b 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit b09610e10592af6224b64507f1d6d209d4baf6c9 +Subproject commit df7a2c1b05614a1dae2209f108d7d9ac06c7f4d6 diff --git a/qtandroidextras b/qtandroidextras index 82fc3412..dafb9ad2 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 82fc3412c648d17ce99aecf7b46b273f72a4dbda +Subproject commit dafb9ad2ecdfa35fc9f36b1596fd5c6e52e92325 diff --git a/qtbase b/qtbase index 3bac18da..1f1e2aa5 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 3bac18da8ef9f5750207ddf47192b5db3137c4ac +Subproject commit 1f1e2aa57b480f0b227e11d0cff0b3cfcffb1f39 diff --git a/qtcanvas3d b/qtcanvas3d index c8ca99e2..96a47ce9 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit c8ca99e24e6ec57d961050ebe31da2109208c720 +Subproject commit 96a47ce9de9e61ca92561160bc6d586c156094d2 diff --git a/qtcharts b/qtcharts index cf3255b1..28f83722 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit cf3255b18b488c7bb1802a9447f7b0ed0a2a4434 +Subproject commit 28f8372233b5a4bbc740959d4a7d0d4823727798 diff --git a/qtconnectivity b/qtconnectivity index 77186711..5f30c774 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 771867113c7d531f576768652a40c5cf53d9e57f +Subproject commit 5f30c77484a9af223d32067f579d440010520eb2 diff --git a/qtdatavis3d b/qtdatavis3d index d4ef709d..f305948c 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit d4ef709d16b6a22ee024069c19aba2a9311f8f9d +Subproject commit f305948c23f631ddce3e49c4bd90149997c0903c diff --git a/qtdeclarative b/qtdeclarative index 9dee5348..12e41a09 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 9dee534836092787d774be7face029b5cf53e546 +Subproject commit 12e41a09bd6eeb613e1f773de70baaad20b88cc3 diff --git a/qtdoc b/qtdoc index 95f0ad63..f11e4a9a 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 95f0ad632ba1551974d4eacbd9ae08012a460e46 +Subproject commit f11e4a9aba5d916a29810e78874ae51ca193bcf7 diff --git a/qtgamepad b/qtgamepad index 7d1b726d..e3b436f6 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 7d1b726d0c338162be5e388bc594a52714d20f18 +Subproject commit e3b436f6718e666f4c5baa3b768993382809e1ed diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 76191bb1..965da52a 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 76191bb1df602aa4a2bf99a3a0b21bb081a52693 +Subproject commit 965da52a583a27fc41a489a4141f78c3acb0d143 diff --git a/qtimageformats b/qtimageformats index 7cfe47a8..855106d1 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 7cfe47a8fe2f987fb2a066a696fb3d9d0afe4d65 +Subproject commit 855106d17258638cf50099b47d2db801c747ebb6 diff --git a/qtlocation b/qtlocation index 571126c3..67a93bb3 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 571126c3d63f899a67b896886aaec8cf4f0acb1c +Subproject commit 67a93bb3684b5146505cf570da6c714d0bfe4b1d diff --git a/qtmacextras b/qtmacextras index 61df18da..19e8855c 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 61df18dac61bab1bc9fbc971ac9a6107734e2ee8 +Subproject commit 19e8855c9a47753313aa361b202a36703401fce1 diff --git a/qtmultimedia b/qtmultimedia index c5400d31..e9aa969c 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit c5400d31a40847e2905b11759090400653624a94 +Subproject commit e9aa969c8cc2226081326e8e1d01f0044fcd7411 diff --git a/qtnetworkauth b/qtnetworkauth index c47f2735..f76f07ee 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit c47f273569fd389ab86e75749166a953f015ecb9 +Subproject commit f76f07ee7328b8d402bf0b12aa99023b8955d4ed diff --git a/qtpurchasing b/qtpurchasing index b888333a..e5ae8515 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit b888333a425e3a5d52c06e9891440b7c056bdca6 +Subproject commit e5ae8515422fd0cc7cf9aa91c8b0c38fa53fd9a9 diff --git a/qtquickcontrols b/qtquickcontrols index 4f5b04a5..e0291038 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 4f5b04a5f6376b3b29e37abb6301cc1bdab5af83 +Subproject commit e02910386a4c0c3fd4f813a58b211d21622f750f diff --git a/qtquickcontrols2 b/qtquickcontrols2 index d5cb26bc..c4012e9a 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit d5cb26bc56a3b6f6e99c88654d4f7a65f43551ac +Subproject commit c4012e9a25514a76ae8f826142a3a3b121c9f322 diff --git a/qtscript b/qtscript index 2e67664e..eb287106 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 2e67664efc66e2f96eb8c6859bef6d6a4160bade +Subproject commit eb28710655e4cf1059ec450527061d777fcb867e diff --git a/qtscxml b/qtscxml index 806eae6e..4f6797ac 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 806eae6ed05ba114cdf1d35aa2b0855ebfb5d15b +Subproject commit 4f6797ac018f931f3655a53ca5d4ca0114f321e0 diff --git a/qtsensors b/qtsensors index 4ab2e8f0..58854bdb 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 4ab2e8f086441c06a2dabbd4c62756fc0f029053 +Subproject commit 58854bdb19cfff1c66788a3035f2aa12b34cce00 diff --git a/qtserialbus b/qtserialbus index 23a4f70d..71966594 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 23a4f70d26ac2c74e695a0138eb1d766918973bb +Subproject commit 71966594c3ed75f5a863fc99956aca90d3b08655 diff --git a/qtserialport b/qtserialport index e0bd3949..3f028584 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit e0bd3949c30ce9c1988a6d6a3c0850d16a1fb33a +Subproject commit 3f0285847230151026890e668b2ff13944b902ee diff --git a/qtspeech b/qtspeech index 34a26b67..311b5ca4 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 34a26b6773f1d9a5592ecb02e08209a0b74fa92f +Subproject commit 311b5ca4c814e6ec54b598d88f1faf7999b11fb5 diff --git a/qtsvg b/qtsvg index 1262e6dc..32c93cbc 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 1262e6dc979d0624307897980be27b8310fe34a0 +Subproject commit 32c93cbca8b2f337e0801537d52e416289b3f464 diff --git a/qttools b/qttools index a2a0ff86..ff440191 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit a2a0ff8676bce46ed1ae7c387cbcd2f5377a0e01 +Subproject commit ff440191de244307c968b251faee4122267d3094 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index c40e19e8..631b2089 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit c40e19e8012788522806f25589d7c41d93d423b4 +Subproject commit 631b2089bc1cc73aa78a4ede1a731c8bdfbe8503 diff --git a/qtwayland b/qtwayland index c3b6c4d4..8bf3546c 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit c3b6c4d442c8187e43601c548bc58ce3e4fe21f3 +Subproject commit 8bf3546cb1fc07849cec0c2b509882970cc78a9c diff --git a/qtwebchannel b/qtwebchannel index b4277bf9..daecad4c 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit b4277bf9bf30f1fc8cba1d6c7185e991e83e6e18 +Subproject commit daecad4cc7552cff68aa6c87cd78cb3b7a0d73f6 diff --git a/qtwebengine b/qtwebengine index d4ef262a..53df50a0 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit d4ef262a9e84f73c7bd211c843b8094eb4863a17 +Subproject commit 53df50a08fa68e85afea5ed02326eb8616fa1ee9 diff --git a/qtwebglplugin b/qtwebglplugin index e87065b1..9a19f140 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit e87065b17b9797aaeb0405a9c4b6191d1745d505 +Subproject commit 9a19f14013519f3c00a53b4204c7a7d1b2d0acc5 diff --git a/qtwebsockets b/qtwebsockets index cf41cd16..e71467cb 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit cf41cd16a1f156d68f9cb4a84dd77230f29d739f +Subproject commit e71467cb569c8d1453e023701b17c9ce9e3fdb86 diff --git a/qtwebview b/qtwebview index c95d904f..b9fef247 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit c95d904fa11b925a1617e4b5b2a87915079d8642 +Subproject commit b9fef247821416de6532a5ed375a01039c6336dd diff --git a/qtwinextras b/qtwinextras index da2c3338..5a2ce610 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit da2c33386d4c55638c5d2d797ea416562e98d3cb +Subproject commit 5a2ce610f2ac011875a9e5879dae5060ea34db48 diff --git a/qtx11extras b/qtx11extras index acebfcd6..295c13f5 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit acebfcd63f34123e9a57d4ab76526eb0dd8cefff +Subproject commit 295c13f5779795c5ec49c7a1ada70287707a8fd6 diff --git a/qtxmlpatterns b/qtxmlpatterns index dbc1311a..15e22118 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit dbc1311af757c5acdca034d3632dca3bf1f81af5 +Subproject commit 15e22118d01ae39722d1836715fe9cf8b6d3ee88 From 0a5c08be351ac99054cb894131fbf475798f580c Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Mon, 10 Sep 2018 10:46:44 +0200 Subject: [PATCH 26/36] Update submodules on '5.12' in qt5 Skip qtbase in this round. Change-Id: Id55013815613d188ffaf46d7eb9bdb8c46085898 Reviewed-by: Liang Qi --- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtmultimedia | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qttools | 2 +- qtwayland | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qtconnectivity b/qtconnectivity index c77d7bb1..fa9aa433 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit c77d7bb17e9b0174abc045f73430291710acfc3c +Subproject commit fa9aa433f88274e8871e4899d9cd88cbb9190793 diff --git a/qtdeclarative b/qtdeclarative index d71df8db..0b157e9a 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit d71df8db162ff8b4d6bd1833c088024b8870b02c +Subproject commit 0b157e9ab3b2b6282e567e656b5f6b8c713a9ac3 diff --git a/qtdoc b/qtdoc index d9e2f412..08af1635 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit d9e2f412cc6a9149491b7499039ccfe2038a26ab +Subproject commit 08af1635e9f06bb8ff51dd592bbcbf751bb240bf diff --git a/qtmultimedia b/qtmultimedia index 871a097d..1ca79e86 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 871a097d0c6e8203f82b398e21dcfd8151bdae27 +Subproject commit 1ca79e8645f9f3cf471c32cf9fd2894a4b41bcb1 diff --git a/qtsensors b/qtsensors index 12bb2552..5872f9c9 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 12bb2552599111aa2f7b6dc69bd0dd565edba710 +Subproject commit 5872f9c94848182ed962f649c67da304df08e53e diff --git a/qtserialbus b/qtserialbus index 9f5b14b0..b7e1c1a4 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 9f5b14b06775e91ac65dc3c0b0ea3a54235a93a2 +Subproject commit b7e1c1a4ebb946c9340445b95cde3aefb1dec7b3 diff --git a/qttools b/qttools index aac2b1cd..341d55b7 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit aac2b1cdbb4003fd8427be628d33c7e2f6d66aaa +Subproject commit 341d55b7cdf8bbb5a045ab21ac1396d1ea766344 diff --git a/qtwayland b/qtwayland index 8b62fafc..122123bf 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 8b62fafcbe3ec5c1b50d9c3845b5ac961c9c3e87 +Subproject commit 122123bfa4a65b04884f1d930900cb342fb7741c From d038ea67576833a5096efbe8a868b574283df5ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Wed, 5 Sep 2018 12:55:55 +0300 Subject: [PATCH 27/36] Provision GCC 8.2 to Ubuntu 18.04 and set as default compiler The provisioning scripts supports prebuilt binaries. When available, those are extracted taken into use. If they are not found, sources are downloaded and built. Task-number: QTQAINFRA-2066 Change-Id: Id1a59be2d1cbdb29d316ade572c3ce8f17ad3a6b Reviewed-by: Heikki Halmet --- coin/provisioning/common/linux/gcc.sh | 102 ++++++++++++++++++ .../qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh | 9 ++ 2 files changed, 111 insertions(+) create mode 100755 coin/provisioning/common/linux/gcc.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh diff --git a/coin/provisioning/common/linux/gcc.sh b/coin/provisioning/common/linux/gcc.sh new file mode 100755 index 00000000..44ff654b --- /dev/null +++ b/coin/provisioning/common/linux/gcc.sh @@ -0,0 +1,102 @@ +#!/usr/bin/env bash + +############################################################################# +## +## 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. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +# This script builds GCC from sources + +# shellcheck source=../unix/DownloadURL.sh +source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" + +set -ex + +function InstallGCC() { + version=$1 + priority=$2 + prebuiltSHA1=$3 + sourcesSHA1=$4 + + tmpFolder="/tmp" + + prebuiltGCC="http://ci-files01-hki.intra.qt.io/input/gcc/gcc-$version-prebuilt.tar.gz" + prebuiltTarget="$tmpFolder/gcc-$version-prebuilt.tar.gz" + installPrefix="/usr/local" + + suffixVersion=$(echo "$version" | cut -d "." -f1,2) + sourceFile="gcc-$version.tar.xz" + cachedUrl="http://ci-files01-hki.intra.qt.io/input/gcc/$sourceFile" + officialUrl="ftp://ftp.mpi-sb.mpg.de/pub/gnu/mirror/gcc.gnu.org/pub/gcc/releases/gcc-$version/$sourceFile" + + targetFile="$tmpFolder/$sourceFile" + buildFolder="$HOME/gcc_build" + + echo "Fetching prebuilt GCC." + curl --fail -L --retry 5 --retry-delay 5 -o "$prebuiltTarget" "$prebuiltGCC" || ( + echo "Fetching prebuilt GCC failed. Building from sources." + DownloadURL "$cachedUrl" "$officialUrl" "$sourcesSHA1" "$targetFile" + ) + + if [ -f "$prebuiltTarget" ]; then + echo "$prebuiltSHA1 *$prebuiltTarget" | sha1sum -c - + sudo tar -xzf "$prebuiltTarget" -C "$installPrefix" + rm -rf "$prebuiltTarget" + else + tar -C "$tmpFolder" -xJf "$targetFile" + mkdir -p "$buildFolder" + cd "$tmpFolder/gcc-$version" + sudo "$tmpFolder/gcc-$version/contrib/download_prerequisites" + cd "$buildFolder" + "$tmpFolder/gcc-$version/configure" --disable-bootstrap --enable-languages=c,c++,lto --prefix="$installPrefix" --program-suffix="-$suffixVersion" + make -j4 + sudo make install + + rm -rf "$targetFile" + rm -rf "$tmpFolder/gcc-$version" + fi + + # openSUSE has update-alternatives under /usr/sbin and it has grouped the commands by means of master and slave links + if [ -f "/usr/sbin/update-alternatives" ]; then + sudo /usr/sbin/update-alternatives --install /usr/bin/gcc gcc "$installPrefix/bin/gcc-$suffixVersion" "$priority" \ + --slave /usr/bin/g++ g++ "$installPrefix/bin/g++-$suffixVersion" \ + --slave /usr/bin/cc cc "$installPrefix/bin/gcc-$suffixVersion" \ + --slave /usr/bin/c++ c++ "$installPrefix/bin/g++-$suffixVersion" + else + sudo /usr/bin/update-alternatives --install /usr/bin/gcc gcc "$installPrefix/bin/gcc-$suffixVersion" "$priority" + sudo /usr/bin/update-alternatives --install /usr/bin/g++ g++ "$installPrefix/bin/g++-$suffixVersion" "$priority" + sudo /usr/bin/update-alternatives --install /usr/bin/cc cc "$installPrefix/bin/gcc-$suffixVersion" "$priority" + sudo /usr/bin/update-alternatives --install /usr/bin/c++ c++ "$installPrefix/bin/g++-$suffixVersion" "$priority" + fi + + + echo "GCC = $version" >> ~/versions.txt +} diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh new file mode 100755 index 00000000..62940e21 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-gcc.sh @@ -0,0 +1,9 @@ +#!/usr/bin/env bash + +set -ex + +# shellcheck source=../common/linux/gcc.sh +source "${BASH_SOURCE%/*}/../common/linux/gcc.sh" + +InstallGCC 8.2.0 50 19e40bea7df5dbadb22eec09ada621ecd9235687 19926bdb6c4b58891015929853d41aeff019d400 + From 36dbfa3b97e2155636026bb0ab2776a627943318 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joni=20J=C3=A4ntti?= Date: Fri, 7 Sep 2018 15:23:01 +0300 Subject: [PATCH 28/36] Provisioning: Add chmod +x to Squish .run file MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This file needs execution rights before it can be run in provisioning. Change-Id: Id49de89e0260b18a71cbcd4f4dc2b5a28e0a9890 Reviewed-by: Heikki Halmet Reviewed-by: Johanna Äijälä Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/unix/squishInstall.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/coin/provisioning/common/unix/squishInstall.sh b/coin/provisioning/common/unix/squishInstall.sh index cf1468c6..6924ca4b 100755 --- a/coin/provisioning/common/unix/squishInstall.sh +++ b/coin/provisioning/common/unix/squishInstall.sh @@ -129,6 +129,7 @@ function MountAndInstall { echo "'run-file', no need to uncompress" sudo cp $targetFileMount $targetDirectory UnMount + sudo chmod +x $targetDirectory/$targetFile sudo $targetDirectory/$targetFile unattended=1 targetdir="$targetDirectory/package" qtpath="$targetDirectory" > /dev/null 2>&1 sudo rm -fr "$targetDirectory/$targetFile" if uname -a |grep -q "Ubuntu"; then From 1cad3084a905454d06497bfe189b232a976b04d0 Mon Sep 17 00:00:00 2001 From: Johanna Aijala Date: Thu, 24 May 2018 14:49:22 +0300 Subject: [PATCH 29/36] Use Squish 6.3.2 Qt5.10 on Qt5.12 RTA tests Update to latest Squish versions that Froglogic is providing. May need to update to Squish 6.4 later, but now we use 6.3.2. Change-Id: I89e1f20b58cdd2e948c8021a5fdc357bfc201db1 Reviewed-by: Liang Qi --- coin/provisioning/common/unix/squishInstall.sh | 4 ++-- coin/provisioning/common/windows/squishInstall.ps1 | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/coin/provisioning/common/unix/squishInstall.sh b/coin/provisioning/common/unix/squishInstall.sh index 6924ca4b..0f31e5fd 100755 --- a/coin/provisioning/common/unix/squishInstall.sh +++ b/coin/provisioning/common/unix/squishInstall.sh @@ -38,9 +38,9 @@ set -ex # This script will install squish package for Linux and Mac. # Squish is need by Release Test Automation (RTA) -version="6.3.0" +version="6.3.2" # Branch version without dot -qtBranch="59x" +qtBranch="510x" squishFolder="/opt/squish" squishUrl="ci-files01-hki.intra.qt.io:/hdd/www/input/squish/coin/$qtBranch/" squishFile="squish-$version-qt$qtBranch-linux64.run" diff --git a/coin/provisioning/common/windows/squishInstall.ps1 b/coin/provisioning/common/windows/squishInstall.ps1 index 8db53ca7..5fb032f5 100644 --- a/coin/provisioning/common/windows/squishInstall.ps1 +++ b/coin/provisioning/common/windows/squishInstall.ps1 @@ -38,11 +38,11 @@ # NOTE! Make sure 64bit versions are always installed before 32bit, # because they use same folder name before a rename -$version = "6.3.0" +$version = "6.3.2" # Qt branch without dot (*.*) -$qtBranch = "59x" -# So far Squish built with Qt5.9 works also with 5.10 and 5.11, but we have to be prepared that on some point +$qtBranch = "510x" +# So far Squish built with Qt5.10 works also with 5.11, but we have to be prepared that on some point # the compatibility breaks, and we may need to have separate Squish packages for different Qt versions. $targetDir = "C:\Utils\squish" From 7bc473908ee07b3fb81ef31f8aa28106eeb1be8f Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 11 Sep 2018 10:34:48 +0200 Subject: [PATCH 30/36] Update submodules on '5.12' in qt5 Change-Id: Icf10a073edbc1dde7868d4390dacd6935c037522 Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtcharts | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtscript | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qtwebchannel | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 31 files changed, 31 insertions(+), 31 deletions(-) diff --git a/qt3d b/qt3d index ed7e50c8..dca07bf5 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit ed7e50c8518f8d385b22a8f587d860f7d49d1ecc +Subproject commit dca07bf5b82af982db8b4c442e606b027bf52cb0 diff --git a/qtactiveqt b/qtactiveqt index 37edb446..7aff688b 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 37edb4464e5f05d239cff4e53c5552fc851960a1 +Subproject commit 7aff688b64bb9fadd21bd53d749f28bca3305c64 diff --git a/qtandroidextras b/qtandroidextras index e72bba43..467eacf0 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit e72bba4352a2c366887483a4d9ee5afd97589c0b +Subproject commit 467eacf0a0379356ea99f53c1300f07261d1664c diff --git a/qtbase b/qtbase index 295cd87c..405e2977 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 295cd87c6d4cb6c9c1222fc565031377e5f33704 +Subproject commit 405e297756240b5f14e44b5fbd6a88091d2eddeb diff --git a/qtcanvas3d b/qtcanvas3d index fb5394ce..5119cd5c 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit fb5394ce6d38d06c13b01574cf00d4fe98025c52 +Subproject commit 5119cd5caa9b990cbcb549178a16133a0e8d9863 diff --git a/qtcharts b/qtcharts index 79888d87..efb38ada 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 79888d87ad08ec120fc170c7d450c5ac1067ce89 +Subproject commit efb38adac6cb3018bc344bef9d4890f22142033e diff --git a/qtdatavis3d b/qtdatavis3d index eea291d2..7320188f 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit eea291d2a53ed1e390baa9ed1ca59fb764b8b4ad +Subproject commit 7320188f253b8a382a03dba170ae47deec0425e5 diff --git a/qtdeclarative b/qtdeclarative index 0b157e9a..f3daa8bb 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 0b157e9ab3b2b6282e567e656b5f6b8c713a9ac3 +Subproject commit f3daa8bb97bbfc7a309c2bf59de1e41d279e05d1 diff --git a/qtgamepad b/qtgamepad index c24058f3..03b5dd34 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit c24058f3a4f208915b14da5d07d707fddac126d9 +Subproject commit 03b5dd34e0f4277be1c1210b1db7e523569bf4cd diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 69dddc61..314a2b53 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 69dddc6190800b56b88f3322c231e67a5b86fdd0 +Subproject commit 314a2b53a885a41f0a220fdcd5e8cd4592078b29 diff --git a/qtimageformats b/qtimageformats index dd38f75d..c2cb9d28 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit dd38f75d8614e5d4e1906594e1d83f284af42457 +Subproject commit c2cb9d286695bd3985c3ad18366e640abcc760d3 diff --git a/qtlocation b/qtlocation index 299b22f7..81101e29 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 299b22f70fb2ae89171d456b062c4f2dd3e9339d +Subproject commit 81101e29b7f79f9514dde560ebb8e05f795119f8 diff --git a/qtmacextras b/qtmacextras index ff8a3384..41f3e8a4 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit ff8a3384726a9e54fb7cd815e10235b9351cd288 +Subproject commit 41f3e8a4d295d79cc4fad31d6ca0d1fa662bdb51 diff --git a/qtnetworkauth b/qtnetworkauth index 093e7176..a8765e4e 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 093e7176cf9627db0ea1673ca329b722bd2397a7 +Subproject commit a8765e4e37ce02c8de26e4675a4fa034266412bc diff --git a/qtpurchasing b/qtpurchasing index b474eb62..cb92e437 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit b474eb62c44c002e1b78bae97dde0bf77b735dce +Subproject commit cb92e437619c7fcb1d101bd89b033283bccd52f0 diff --git a/qtqa b/qtqa index 509c0bd2..711ef5a1 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 509c0bd23590e0e39189ed96448263fa248aac67 +Subproject commit 711ef5a1611b3f9428811856abdcbb8cd335d2d4 diff --git a/qtquickcontrols b/qtquickcontrols index 07296992..1056eb37 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 07296992462dccf7e4512a829e9e1e5374f42764 +Subproject commit 1056eb37c970a7145755d0280f03d049d9a77bd5 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 7e38097f..b9e7d9aa 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 7e38097fb03b1b304a90630b475fe1f771a44d4e +Subproject commit b9e7d9aadc8f70644c24469d802e9366a2a422bf diff --git a/qtscript b/qtscript index 5f3e6f8a..42742b84 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 5f3e6f8a369839f51e65c65d65da45bd0f879358 +Subproject commit 42742b847213f7041fc686d7e15182c4669f897d diff --git a/qtserialbus b/qtserialbus index b7e1c1a4..4d1f916e 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit b7e1c1a4ebb946c9340445b95cde3aefb1dec7b3 +Subproject commit 4d1f916efb4c814e76dce9f05e092b301aebd2bd diff --git a/qtserialport b/qtserialport index d4b48a8e..c5ffb2ab 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit d4b48a8ef81b7a3912ccee387ceb976d67a8b870 +Subproject commit c5ffb2ab8f546c8d7c3e88760c2666d6d185ced0 diff --git a/qtspeech b/qtspeech index 35d8b9ea..cf58c73f 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 35d8b9ea60b41d1798ccd2e63db50c895213eff7 +Subproject commit cf58c73fb6f2b98887b69d8ccaa654ce5ffb4036 diff --git a/qtsvg b/qtsvg index 907c2db4..c2edcd01 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 907c2db46915eedac02f2a5a26291d2ce19282f9 +Subproject commit c2edcd013a0671df72eefcbab84fa2941aa22044 diff --git a/qttools b/qttools index 341d55b7..474af549 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 341d55b7cdf8bbb5a045ab21ac1396d1ea766344 +Subproject commit 474af549e4fc8a662031ec87880a1ecb97da2154 diff --git a/qtwebchannel b/qtwebchannel index e6c5b444..7ab88507 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit e6c5b44453635be0f05f3ee9545e3cb348e1b1a9 +Subproject commit 7ab88507fbd43cc51c2600c1656ed32d56d3703a diff --git a/qtwebglplugin b/qtwebglplugin index 90bb25e2..64f6bf45 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 90bb25e2132aded600cf68337f2390e3eb7d7a0d +Subproject commit 64f6bf45187a449986b5a5153abcc75ce987e9e0 diff --git a/qtwebsockets b/qtwebsockets index 4321fd13..02db65be 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 4321fd13ac58e5bebe4d564431e9c18b627598bc +Subproject commit 02db65bebc051bf4e88457f315b8ecce2e784074 diff --git a/qtwebview b/qtwebview index 4ff9794d..cd0814a2 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 4ff9794dbbbddef604cafa10524a873a2b99a234 +Subproject commit cd0814a2431db435279cf775a0fca460a0b81582 diff --git a/qtwinextras b/qtwinextras index 44a28955..48b4b562 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 44a28955dc8090dc8e9fa59e57c664e78d24be5e +Subproject commit 48b4b562a226cd2a8a8805d80b1a52fdc758b1de diff --git a/qtx11extras b/qtx11extras index ce110b08..2326dcdf 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit ce110b084c74aa4d5d59a06dd049a12eee6aa5b5 +Subproject commit 2326dcdf30772c7a73136b5537c02128884579a0 diff --git a/qtxmlpatterns b/qtxmlpatterns index 99490652..d5762832 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 9949065280674cf06a6a9670c1100d9ab8156df6 +Subproject commit d5762832ea8e5ca37457b2fa895bacf70173fde5 From 9a7969f76cbcc59c478d41e4b3de3b8e2b8f2cfa Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 12 Sep 2018 13:30:02 +0200 Subject: [PATCH 31/36] Update submodules on '5.12' in qt5 Change-Id: I1f0cfca076840b06faf3ed8b606857be3f690e41 Reviewed-by: Liang Qi --- qtactiveqt | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtquickcontrols2 | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebglplugin | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/qtactiveqt b/qtactiveqt index 7aff688b..9f68ebfd 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 7aff688b64bb9fadd21bd53d749f28bca3305c64 +Subproject commit 9f68ebfd2172dc807fb3e24c36ae8c0bec03dad0 diff --git a/qtbase b/qtbase index 405e2977..9d1c881f 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 405e297756240b5f14e44b5fbd6a88091d2eddeb +Subproject commit 9d1c881f491363f330284ddb177cbee5f3e9952d diff --git a/qtconnectivity b/qtconnectivity index fa9aa433..af07a801 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit fa9aa433f88274e8871e4899d9cd88cbb9190793 +Subproject commit af07a801cb85094d2ab4a45244d5172e64f8ff7b diff --git a/qtdeclarative b/qtdeclarative index f3daa8bb..49c9a5fb 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit f3daa8bb97bbfc7a309c2bf59de1e41d279e05d1 +Subproject commit 49c9a5fbdbb14f87876de2e44b2783239ff2fdff diff --git a/qtlocation b/qtlocation index 81101e29..9e1523f4 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 81101e29b7f79f9514dde560ebb8e05f795119f8 +Subproject commit 9e1523f40c6b376829c3eb513a7a5922fc2172ff diff --git a/qtquickcontrols2 b/qtquickcontrols2 index b9e7d9aa..e8c61951 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit b9e7d9aadc8f70644c24469d802e9366a2a422bf +Subproject commit e8c619517ba1f75224c61334f67ae165d704b184 diff --git a/qttools b/qttools index 474af549..1410f2cf 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 474af549e4fc8a662031ec87880a1ecb97da2154 +Subproject commit 1410f2cf5c124bc3f17eb3b0221f3707aae49d91 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 3adc25c8..eced023c 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 3adc25c8b2105418f86d0c6390832e887d483cc0 +Subproject commit eced023cca650e3769568665cec51f6b16eca586 diff --git a/qtwayland b/qtwayland index 122123bf..f669fc97 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 122123bfa4a65b04884f1d930900cb342fb7741c +Subproject commit f669fc9749fce770420e1efece893bb2724a003c diff --git a/qtwebengine b/qtwebengine index 964b882c..c91bba7a 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 964b882c0817b2dc8ebd631658b4faac926b0145 +Subproject commit c91bba7af3215107916a135733dcf428f57a564f diff --git a/qtwebglplugin b/qtwebglplugin index 64f6bf45..b6fcf62d 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 64f6bf45187a449986b5a5153abcc75ce987e9e0 +Subproject commit b6fcf62d482215f0d5c0fa443cd4ae470f2548cf From 974884c0d158732f1dd1870ff027159ace6099ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joni=20J=C3=A4ntti?= Date: Tue, 11 Sep 2018 14:21:40 +0300 Subject: [PATCH 32/36] Provisioning: Rebase Ubuntu provisioning Some provisioning changes made to Ubuntu 16.04 didn't make it to 18.04 when the new platform was introduced. These changes need to be included. Task-number: QTQAINFRA-2210 Change-Id: Ie8c3cfda95abadbd3a416545ebcfbbab8c0cb4ad Reviewed-by: Dominik Holland Reviewed-by: Liang Qi --- coin/provisioning/common/linux/docker.sh | 52 ++++++++++++++++++ .../linux/ubuntu-version.sh} | 2 +- .../80-docker.sh | 54 ++----------------- .../qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh | 7 +++ .../22-mqtt_broker.sh | 0 .../80-docker.sh | 4 ++ .../99-version.sh | 4 ++ .../yocto_ssh_configurations.sh | 0 8 files changed, 71 insertions(+), 52 deletions(-) create mode 100755 coin/provisioning/common/linux/docker.sh rename coin/provisioning/{qtci-linux-Ubuntu-16.04-x86_64/99-version.sh => common/linux/ubuntu-version.sh} (97%) mode change 100644 => 100755 coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/22-mqtt_broker.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/80-docker.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/99-version.sh rename coin/provisioning/{qtci-linux-Ubuntu-16.04-x86_64 => qtci-linux-Ubuntu-18.04-x86_64}/yocto_ssh_configurations.sh (100%) diff --git a/coin/provisioning/common/linux/docker.sh b/coin/provisioning/common/linux/docker.sh new file mode 100755 index 00000000..16af0a0a --- /dev/null +++ b/coin/provisioning/common/linux/docker.sh @@ -0,0 +1,52 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the provisioning scripts of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +set -ex + +# Download and install the docker engine. +sudo apt-get install curl -y +curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - +sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" +sudo apt-get update +sudo apt-get install docker-ce -y +sudo usermod -a -G docker $USER +sudo docker info + +# Download and install the docker-compose extension. +sudo curl -L https://github.com/docker/compose/releases/download/1.21.0/docker-compose-$(uname -s)-$(uname -m) -o /usr/local/bin/docker-compose +sudo chmod +x /usr/local/bin/docker-compose + +# Start testserver provisioning +source "${BASH_SOURCE%/*}/testserver/docker_testserver.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/99-version.sh b/coin/provisioning/common/linux/ubuntu-version.sh similarity index 97% rename from coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/99-version.sh rename to coin/provisioning/common/linux/ubuntu-version.sh index 21a4c4cf..d403df13 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/99-version.sh +++ b/coin/provisioning/common/linux/ubuntu-version.sh @@ -43,4 +43,4 @@ echo "***** All installed packages *****" >> ~/versions.txt apt list --installed >> ~/versions.txt echo "*********************************************" >> ~/versions.txt -"$(dirname "$0")/../common/linux/version.sh" +"$(dirname "$0")/version.sh" diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/80-docker.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/80-docker.sh index 90c3a7eb..4a6681f3 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/80-docker.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/80-docker.sh @@ -1,52 +1,4 @@ -#!/usr/bin/env bash +#!/bin/bash -############################################################################# -## -## Copyright (C) 2017 The Qt Company Ltd. -## Contact: http://www.qt.io/licensing/ -## -## This file is part of the provisioning scripts of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:LGPL21$ -## Commercial License Usage -## Licensees holding valid commercial Qt licenses may use this file in -## accordance with the commercial license agreement provided with the -## Software or, alternatively, in accordance with the terms contained in -## a written agreement between you and The Qt Company. For licensing terms -## and conditions see http://www.qt.io/terms-conditions. For further -## information use the contact form at http://www.qt.io/contact-us. -## -## GNU Lesser General Public License Usage -## Alternatively, this file may be used under the terms of the GNU Lesser -## General Public License version 2.1 or version 3 as published by the Free -## Software Foundation and appearing in the file LICENSE.LGPLv21 and -## LICENSE.LGPLv3 included in the packaging of this file. Please review the -## following information to ensure the GNU Lesser General Public License -## requirements will be met: https://www.gnu.org/licenses/lgpl.html and -## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -## -## As a special exception, The Qt Company gives you certain additional -## rights. These rights are described in The Qt Company LGPL Exception -## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -## -## $QT_END_LICENSE$ -## -############################################################################# - -set -ex - -# Download and install the docker engine. -sudo apt-get install curl -y -curl -fsSL https://download.docker.com/linux/ubuntu/gpg | sudo apt-key add - -sudo add-apt-repository "deb [arch=amd64] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" -sudo apt-get update -sudo apt-get install docker-ce -y -sudo usermod -a -G docker $USER -sudo docker info - -# Download and install the docker-compose extension. -sudo curl -L https://github.com/docker/compose/releases/download/1.21.0/docker-compose-$(uname -s)-$(uname -m) -o /usr/local/bin/docker-compose -sudo chmod +x /usr/local/bin/docker-compose - -# Start testserver provisioning -source "${BASH_SOURCE%/*}/../common/linux/testserver/docker_testserver.sh" +BASEDIR=$(dirname "$0") +$BASEDIR/../common/linux/docker.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh index ff2f1dac..92b7a990 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh @@ -96,6 +96,7 @@ installPackages+=(g++-multilib) installPackages+=(python3-dev) installPackages+=(python3-pip) installPackages+=(python3-virtualenv) +installPackages+=(python3-wheel) # python2 development package installPackages+=(python-dev) # Automates interactive applications (Needed by RTA to automate configure testing) @@ -150,3 +151,9 @@ sudo DEBIAN_FRONTEND=noninteractive apt-get -q -y install "${installPackages[@]} echo "Running update for apt" waitLoop sudo apt-get update + +# Install all needed packages in a special wheel cache directory +pip3 wheel --wheel-dir $HOME/python3-wheels -r ${BASH_SOURCE%/*}/../common/shared/requirements.txt + +source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" +SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels" diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/22-mqtt_broker.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/22-mqtt_broker.sh old mode 100644 new mode 100755 diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/80-docker.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/80-docker.sh new file mode 100755 index 00000000..4a6681f3 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/80-docker.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +BASEDIR=$(dirname "$0") +$BASEDIR/../common/linux/docker.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/99-version.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/99-version.sh new file mode 100644 index 00000000..b062800a --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/99-version.sh @@ -0,0 +1,4 @@ +#!/bin/bash + +BASEDIR=$(dirname "$0") +$BASEDIR/../common/linux/ubuntu-version.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/yocto_ssh_configurations.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/yocto_ssh_configurations.sh similarity index 100% rename from coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/yocto_ssh_configurations.sh rename to coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/yocto_ssh_configurations.sh From d25341093a8cbb0ce912e6034ca9438da2f5d42c Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 14 Sep 2018 17:32:35 +0200 Subject: [PATCH 33/36] Update submodules on '5.12' in qt5 Change-Id: Ib41f214459b3e5dfc5f509871facc6c2212237ed Reviewed-by: Liang Qi --- qtbase | 2 +- qtcanvas3d | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtnetworkauth | 2 +- qtserialbus | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebglplugin | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/qtbase b/qtbase index 9d1c881f..a62bab95 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 9d1c881f491363f330284ddb177cbee5f3e9952d +Subproject commit a62bab95d3adfcd6aab1f32d41750f0c1a5adfe3 diff --git a/qtcanvas3d b/qtcanvas3d index 5119cd5c..e07c2ea8 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 5119cd5caa9b990cbcb549178a16133a0e8d9863 +Subproject commit e07c2ea85f4681acec6fc07a04d2b08f1da0ced6 diff --git a/qtcharts b/qtcharts index efb38ada..b3a1e386 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit efb38adac6cb3018bc344bef9d4890f22142033e +Subproject commit b3a1e386ea584df1a16b645845b22942016464ca diff --git a/qtconnectivity b/qtconnectivity index af07a801..7e4166a6 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit af07a801cb85094d2ab4a45244d5172e64f8ff7b +Subproject commit 7e4166a6ab72a3b52e471f7e694a73bb4fcee109 diff --git a/qtdeclarative b/qtdeclarative index 49c9a5fb..940c06a4 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 49c9a5fbdbb14f87876de2e44b2783239ff2fdff +Subproject commit 940c06a4645cca190055a3987db8147b4e2de02c diff --git a/qtdoc b/qtdoc index 08af1635..ba9709b4 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 08af1635e9f06bb8ff51dd592bbcbf751bb240bf +Subproject commit ba9709b459e7b102aa37f06d351cf7d937d45c76 diff --git a/qtgamepad b/qtgamepad index 03b5dd34..7da78510 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 03b5dd34e0f4277be1c1210b1db7e523569bf4cd +Subproject commit 7da78510f828a02c7a9be70c9f3a37da53521554 diff --git a/qtlocation b/qtlocation index 9e1523f4..b5615f57 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 9e1523f40c6b376829c3eb513a7a5922fc2172ff +Subproject commit b5615f571396365a07f123695a05be66c572f622 diff --git a/qtmacextras b/qtmacextras index 41f3e8a4..b8b7809d 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 41f3e8a4d295d79cc4fad31d6ca0d1fa662bdb51 +Subproject commit b8b7809d2a08c190f493393119626c53da13094a diff --git a/qtnetworkauth b/qtnetworkauth index a8765e4e..51a0b723 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit a8765e4e37ce02c8de26e4675a4fa034266412bc +Subproject commit 51a0b723032640e3b3f99adf3e392ed7d8ceec33 diff --git a/qtserialbus b/qtserialbus index 4d1f916e..4bfbdd3d 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 4d1f916efb4c814e76dce9f05e092b301aebd2bd +Subproject commit 4bfbdd3d061e88de147102db94e70283b89ffff5 diff --git a/qttools b/qttools index 1410f2cf..22809a14 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 1410f2cf5c124bc3f17eb3b0221f3707aae49d91 +Subproject commit 22809a142e08955554c54be452f6ff2e079a7fd8 diff --git a/qtwayland b/qtwayland index f669fc97..c1e36e21 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit f669fc9749fce770420e1efece893bb2724a003c +Subproject commit c1e36e212090cd02bc238f70dfeb70d7c651e348 diff --git a/qtwebengine b/qtwebengine index c91bba7a..7de23e9f 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit c91bba7af3215107916a135733dcf428f57a564f +Subproject commit 7de23e9fbb4c48152de5c1d26ed34cd68666aa30 diff --git a/qtwebglplugin b/qtwebglplugin index b6fcf62d..35e13db6 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit b6fcf62d482215f0d5c0fa443cd4ae470f2548cf +Subproject commit 35e13db60aeee432dc115c691299955e9715b4c2 From c51c0a2b2e3cd68af2c44216bfb0df2c7adc754c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Tue, 11 Sep 2018 12:48:26 +0300 Subject: [PATCH 34/36] Fix shebang on QNX provisioning scripts for Ubuntu 18.04 Change-Id: I74393c3d0382daae9bd1e82a495be19ad2baf90e Reviewed-by: Heikki Halmet --- coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/60-qnx660.sh | 2 +- coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/70-qnx700.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/60-qnx660.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/60-qnx660.sh index 6b5cf23c..1a185223 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/60-qnx660.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/60-qnx660.sh @@ -1,4 +1,4 @@ -#!/bin/env bash +#!/usr/bin/env bash ############################################################################# ## diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/70-qnx700.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/70-qnx700.sh index 7f24d224..24ac2ac0 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/70-qnx700.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/70-qnx700.sh @@ -1,4 +1,4 @@ -#!/bin/env bash +#!/usr/bin/env bash ############################################################################# ## From 0e0d99d617c0b0eff0352d17101b1e1057a8a657 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 9 May 2018 15:33:38 +0300 Subject: [PATCH 35/36] Provisioning: Support for Webassembly This change will install specified packages of Emscripten and set up the build environment for making binary artifacts of WebAssembly Task-number: QTQAINFRA-1972 Change-Id: Ia5df6c208ea8f29ca8948f0273f321a59fc694a2 Reviewed-by: Eskil Abrahamsen Blomfeldt --- coin/platform_configs/qtbase.txt | 2 + coin/provisioning/common/linux/emsdk.sh | 78 +++++++++++++++++++ .../unix/InstallFromCompressedFileFromURL.sh | 5 +- .../55-emsdk.sh | 38 +++++++++ 4 files changed, 122 insertions(+), 1 deletion(-) create mode 100755 coin/provisioning/common/linux/emsdk.sh create mode 100755 coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/55-emsdk.sh diff --git a/coin/platform_configs/qtbase.txt b/coin/platform_configs/qtbase.txt index 4a2c720c..aaac89d0 100644 --- a/coin/platform_configs/qtbase.txt +++ b/coin/platform_configs/qtbase.txt @@ -3,3 +3,5 @@ Template Target OS Target arch Compiler Fe qtci-linux-Ubuntu-18.04-x86_64 QEMU armv7 GCC DeveloperBuild DisableTests qtci-linux-Ubuntu-18.04-x86_64 QEMU arm64 GCC DeveloperBuild DisableTests qtci-windows-10-x86_64-10 WinRT_10 x86_64 MSVC2015 DeveloperBuild Static Release ForceDebugInfo +qtci-linux-openSUSE-42.3-x86_64 WebAssembly GCC DeveloperBuild NoPch DisableTests + diff --git a/coin/provisioning/common/linux/emsdk.sh b/coin/provisioning/common/linux/emsdk.sh new file mode 100755 index 00000000..64753844 --- /dev/null +++ b/coin/provisioning/common/linux/emsdk.sh @@ -0,0 +1,78 @@ +#!/usr/bin/env bash +############################################################################# +## +## 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. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +# shellcheck source=../unix/InstallFromCompressedFileFromURL.sh +source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" +# shellcheck source=../unix/SetEnvVar.sh +source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" +# shellcheck source=../unix/DownloadURL.sh +source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" + +version="1.38.1" +version_node="8.9.1" +urlEmscriptenCache="http://ci-files01-hki.intra.qt.io/input/emsdk/emscripten-$version.tar.gz" +urlEmscriptenExternal="https://github.com/kripken/emscripten/archive/$version.tar.gz" +urlEmscriptenLlvmCache="http://ci-files01-hki.intra.qt.io/input/emsdk/emscripten-llvm-e$version.tar.gz" +urlEmscriptenLlvmExternal="https://s3.amazonaws.com/mozilla-games/emscripten/packages/llvm/tag/linux_64bit/emscripten-llvm-e$version.tar.gz" +urlNodeCache="http://ci-files01-hki.intra.qt.io/input/emsdk/node-v$version_node-linux-x64.tar.xz" +urlNodeExternal="https://s3.amazonaws.com/mozilla-games/emscripten/packages/node-v$version_node-linux-x64.tar.xz" +sha1Emscripten="62243b4219f6ad7f6d4bd5ae4abb27aecb87ffb3" +sha1EmscriptenLlvm="933ea5feab3aa5acc5c1e15a0deccf0e3fbeb0a7" +sha1Node="eaec5de2af934f7ebc7f9597983e71c5d5a9a726" +targetFolder="/opt/emsdk" +sudo mkdir "$targetFolder" + +InstallFromCompressedFileFromURL "$urlEmscriptenCache" "$urlEmscriptenExternal" "$sha1Emscripten" "$targetFolder" "" +InstallFromCompressedFileFromURL "$urlEmscriptenLlvmCache" "$urlEmscriptenLlvmExternal" "$sha1EmscriptenLlvm" "$targetFolder" "" +InstallFromCompressedFileFromURL "$urlNodeCache" "$urlNodeExternal" "$sha1Node" "$targetFolder" "" + +sudo chmod -R a+rwx "$targetFolder" + +echo "Writing $targetFolder/.emscripten" +cat <"$targetFolder/.emscripten" +LLVM_ROOT='$targetFolder/emscripten-llvm-e$version/' +EMSCRIPTEN_NATIVE_OPTIMIZER='$targetFolder/emscripten-llvm-e$version/optimizer' +BINARYEN_ROOT='$targetFolder/emscripten-llvm-e$version/binaryen' +NODE_JS='$targetFolder/node-v$version_node-linux-x64/bin/node' +EMSCRIPTEN_ROOT='$targetFolder/emscripten-$version' +SPIDERMONKEY_ENGINE = '' +V8_ENGINE = '' +TEMP_DIR = '/tmp' +COMPILER_ENGINE = NODE_JS +JS_ENGINES = [NODE_JS] +EOM + +SetEnvVar "PATH" "\"$targetFolder/emscripten-llvm-e$version/:$targetFolder/node-v$version_node-linux-x64/bin:$targetFolder/emscripten-$version:\$PATH\"" +SetEnvVar "EMSCRIPTEN" "$targetFolder/emscripten-$version" +SetEnvVar "EM_CONFIG" "$targetFolder/.emscripten" diff --git a/coin/provisioning/common/unix/InstallFromCompressedFileFromURL.sh b/coin/provisioning/common/unix/InstallFromCompressedFileFromURL.sh index 1185afeb..34bcf289 100755 --- a/coin/provisioning/common/unix/InstallFromCompressedFileFromURL.sh +++ b/coin/provisioning/common/unix/InstallFromCompressedFileFromURL.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## 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. @@ -64,6 +64,9 @@ function InstallFromCompressedFileFromURL { "zip") unzip "$targetFile" -d "$targetDirectory" ;; + "xz") + tar -xf "$targetFile" --directory "$targetDirectory" + ;; *) exit 1 ;; diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/55-emsdk.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/55-emsdk.sh new file mode 100755 index 00000000..ecce5ae7 --- /dev/null +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/55-emsdk.sh @@ -0,0 +1,38 @@ +#!/usr/bin/env bash + +############################################################################# +## +## 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. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +set -ex + +source "${BASH_SOURCE%/*}/../common/linux/emsdk.sh" From e59a97be63c388e041f8c9b6a6fa324ca2aeff6e Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 15 Sep 2018 15:02:53 +0200 Subject: [PATCH 36/36] Update submodules on '5.12' in qt5 Change-Id: I4f74142bd95c043968a80b75ff4a8d69207595dc Reviewed-by: Liang Qi --- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtmultimedia | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtvirtualkeyboard | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qtbase b/qtbase index a62bab95..5728a9d8 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit a62bab95d3adfcd6aab1f32d41750f0c1a5adfe3 +Subproject commit 5728a9d8a7f8b64099cf369d9d307a00b5fce29c diff --git a/qtconnectivity b/qtconnectivity index 7e4166a6..66829dd1 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 7e4166a6ab72a3b52e471f7e694a73bb4fcee109 +Subproject commit 66829dd14377f61b54986f1870bc014daa71e268 diff --git a/qtdeclarative b/qtdeclarative index 940c06a4..6982d0d6 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 940c06a4645cca190055a3987db8147b4e2de02c +Subproject commit 6982d0d6290c137468749bb8ab2f2e20dfa453fd diff --git a/qtmultimedia b/qtmultimedia index 1ca79e86..3ee5afe3 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 1ca79e8645f9f3cf471c32cf9fd2894a4b41bcb1 +Subproject commit 3ee5afe3a47152ab3a2d4a9acf3a5e0458441c98 diff --git a/qtscxml b/qtscxml index b2dbb4ba..d5396ed0 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit b2dbb4ba78ca92e685307be94f28cf0bdb54171e +Subproject commit d5396ed00589374aed8e44f8f2e3217a3fb768df diff --git a/qtsensors b/qtsensors index 5872f9c9..8364c9f6 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 5872f9c94848182ed962f649c67da304df08e53e +Subproject commit 8364c9f67292851c79df284dd9ffaaaeb3a71156 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index eced023c..4ea4835f 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit eced023cca650e3769568665cec51f6b16eca586 +Subproject commit 4ea4835f22096dd2a9b8b14fa191f8bd8f8ad6bb