From 099b7ffe4c386b8997ce2f8014f7f8442a9190a1 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Mon, 18 Feb 2019 09:38:02 +0200 Subject: [PATCH 01/12] Provisioning: Update emsdk version MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTBUG-73867 Change-Id: I2aabbecbce2fc3378db6c0747fc8146c03fac545 Reviewed-by: Morten Johan Sørvig --- coin/provisioning/common/linux/emsdk.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/coin/provisioning/common/linux/emsdk.sh b/coin/provisioning/common/linux/emsdk.sh index 64753844..284eb19d 100755 --- a/coin/provisioning/common/linux/emsdk.sh +++ b/coin/provisioning/common/linux/emsdk.sh @@ -39,7 +39,7 @@ source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" # shellcheck source=../unix/DownloadURL.sh source "${BASH_SOURCE%/*}/../unix/DownloadURL.sh" -version="1.38.1" +version="1.38.16" 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" @@ -47,8 +47,8 @@ urlEmscriptenLlvmCache="http://ci-files01-hki.intra.qt.io/input/emsdk/emscripten 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" +sha1Emscripten="353ad7bf614f73b73ed1d05aedd66321d679e03d" +sha1EmscriptenLlvm="e132c26ad657c07f88cc550fd23f1d6f1b6c0673" sha1Node="eaec5de2af934f7ebc7f9597983e71c5d5a9a726" targetFolder="/opt/emsdk" sudo mkdir "$targetFolder" From 4df2866684116491c35c57d11e1fb692bc00aa0f Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 1 Mar 2019 10:07:25 +0100 Subject: [PATCH 02/12] Update submodules on '5.12' in qt5 Change-Id: I20eba8a90e0683263245a01eac5a553c78961050 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/qt3d b/qt3d index 7f9fdca7..22c66fa9 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 7f9fdca73a17060b9d69db00b5d480690dcae935 +Subproject commit 22c66fa9f7a460f077fede22f285c84276ce3883 diff --git a/qtbase b/qtbase index 501cca2c..a2b31cd5 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 501cca2c4b0851cea7133ba56c3a05d71c25ce6d +Subproject commit a2b31cd5db6410144a613142a7b60f0cd2ba2b1d diff --git a/qtcharts b/qtcharts index 9da68921..de84efac 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 9da68921e4bfb9c362600832b23128d488dc7aff +Subproject commit de84efac79724970bcdeac7fcdfe72a5fa846761 diff --git a/qtconnectivity b/qtconnectivity index 1606ccb7..1b19d798 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 1606ccb76ba72990df652fbd7f01d709ae20b63c +Subproject commit 1b19d7981610c2a9587544da654b4ca783e1bf6b diff --git a/qtdatavis3d b/qtdatavis3d index 54adef94..e91e0d04 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 54adef94a3e9f6112fc74c59bde2b122bcb0e6e3 +Subproject commit e91e0d04e214a372bf0c26b6f2edda1d7c47c552 diff --git a/qtdeclarative b/qtdeclarative index d96a700c..e622e069 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit d96a700cc3611480ff76023287cb06f455a37b02 +Subproject commit e622e069c9b0928e09a8b6fef15168407a4d995a diff --git a/qtdoc b/qtdoc index a38799f6..323572c5 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit a38799f6e165e224750494bf515c78db4c4217db +Subproject commit 323572c586c06b20a8ddccaed0add6deb9283903 diff --git a/qtlocation b/qtlocation index 633b0f40..628cf98e 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 633b0f40ca82709863bad48e0ed6a1c92ad3b8b4 +Subproject commit 628cf98e820f552f228d6f71c770c293fce83a79 diff --git a/qtmultimedia b/qtmultimedia index 4e47d0a7..fea4d302 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 4e47d0a710452cfba62a8a3c2c2ce5c118bc00fe +Subproject commit fea4d302cddbb91e23864a4dbd786d53b72f67ea diff --git a/qtqa b/qtqa index 50586f55..507202b4 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 50586f55f3c057bbcd652a92dfe5ef8564c71741 +Subproject commit 507202b4e7ae9f7a429e7f4d6eceb326e1b1b4af diff --git a/qtquickcontrols b/qtquickcontrols index 65d61277..b7f5cb18 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 65d61277be164a0781f9b57873afc000f36073fa +Subproject commit b7f5cb186df211c1bfcdbaee06fb7ce9146e9a0e diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 0614d792..9fdbdea1 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 0614d792967b7721c692cb273bb5428544fa3680 +Subproject commit 9fdbdea176007ed7b470e317e9002aa77ddd4ead diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index c099fef8..81204883 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit c099fef8041f6cfd56e789b86c70a802c894da34 +Subproject commit 81204883f671951371a8582008e1357634e7ff0f diff --git a/qtwayland b/qtwayland index 4b58ff21..7206b4e8 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 4b58ff21f4a3c629867064289b6c778bbb57f95a +Subproject commit 7206b4e8b6e10f5623b19ca132f538066c96aab5 diff --git a/qtwebengine b/qtwebengine index 74d2d301..598bfc65 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 74d2d301b11f2edfde69f0515e2fd74882ab6dab +Subproject commit 598bfc652edffb047948e01c3c76eb9e0cb7db4e From b74bc40b4145340473f0b7a25c045597397bdbab Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 2 Mar 2019 10:24:25 +0100 Subject: [PATCH 03/12] Update submodules on '5.12' in qt5 Change-Id: I31fc2036208413ee138e6154f65af60e15f0e00c Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qtmultimedia | 2 +- qtpurchasing | 2 +- qtquickcontrols | 2 +- qtscript | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwebengine | 2 +- qtwebview | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/qtbase b/qtbase index a2b31cd5..a74b2b5f 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit a2b31cd5db6410144a613142a7b60f0cd2ba2b1d +Subproject commit a74b2b5f152ae81da6c0906afc63b8647c3a048a diff --git a/qtdeclarative b/qtdeclarative index e622e069..7df099a6 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit e622e069c9b0928e09a8b6fef15168407a4d995a +Subproject commit 7df099a644339a487a5ad681d61efb1c7ecd81f6 diff --git a/qtmultimedia b/qtmultimedia index fea4d302..09490d1a 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit fea4d302cddbb91e23864a4dbd786d53b72f67ea +Subproject commit 09490d1ac6294173004f8f5b948dea9a1e412d3d diff --git a/qtpurchasing b/qtpurchasing index dff997ec..098dd780 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit dff997ecf2984acd7eae650e8ffe3269e6b2a5e2 +Subproject commit 098dd780b7e773f3e945c6e1b4b7fef51fb0a446 diff --git a/qtquickcontrols b/qtquickcontrols index b7f5cb18..46425199 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit b7f5cb186df211c1bfcdbaee06fb7ce9146e9a0e +Subproject commit 46425199ebcdd4cb9facb471f67e17a941ca103f diff --git a/qtscript b/qtscript index 5a9de40f..4749a3ec 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 5a9de40f48f5854b6ff20329ced0f0509b81b48a +Subproject commit 4749a3ec61859e324f14add3008c41f92e6c2793 diff --git a/qtsvg b/qtsvg index a91a6563..f354d4be 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit a91a65632c4d830070e1ca9bbda7e355f1459414 +Subproject commit f354d4be9a7a436fb16bd9764a261c930101850c diff --git a/qttools b/qttools index 6c8d8363..b4597180 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 6c8d836335a0eb57c76aee78b700893ca014fc90 +Subproject commit b4597180191734ca128772d2b8547c6e6c08efa2 diff --git a/qttranslations b/qttranslations index c8a0da51..46220125 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit c8a0da51adcc015447fc26e5a2b3d1de12479f75 +Subproject commit 4622012565e28bffec22daff5fa81addece703e3 diff --git a/qtwebengine b/qtwebengine index 598bfc65..56fadb57 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 598bfc652edffb047948e01c3c76eb9e0cb7db4e +Subproject commit 56fadb571f32b721d8b99554e6e38692009ec37f diff --git a/qtwebview b/qtwebview index 17334eb5..fc039435 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 17334eb56b42114927169ee8eec6512754674fb2 +Subproject commit fc039435b57bb5860ee3c59542d29b106071ffb5 From cfea5af0edd05107e4d9b242c02a60765e10a07d Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 4 Mar 2019 22:26:37 +0100 Subject: [PATCH 04/12] Update submodules on '5.12' in qt5 Change-Id: I99b557104856e3cbf7375f56e7f42b77430bf49f Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qtgraphicaleffects | 2 +- qtscript | 2 +- qtsvg | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qtbase b/qtbase index a74b2b5f..ef5aefb0 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit a74b2b5f152ae81da6c0906afc63b8647c3a048a +Subproject commit ef5aefb062bf8cbfb764f2deba731d3d64069099 diff --git a/qtdeclarative b/qtdeclarative index 7df099a6..783ec607 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 7df099a644339a487a5ad681d61efb1c7ecd81f6 +Subproject commit 783ec60774a565f3a16c25af076b720de0e6acbd diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 56a4a58c..23a9a049 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 56a4a58c999e03385bad6ab052f87ffe2c63500f +Subproject commit 23a9a04935c28110c2cff0d71873573d8f8f51c3 diff --git a/qtscript b/qtscript index 4749a3ec..a122caec 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 4749a3ec61859e324f14add3008c41f92e6c2793 +Subproject commit a122caecff790a82f707894fa9db72afe91fcb7e diff --git a/qtsvg b/qtsvg index f354d4be..6f152f87 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit f354d4be9a7a436fb16bd9764a261c930101850c +Subproject commit 6f152f87dbbd47acc58458d636ce5d1cc181b8fd From 88b35a49212e4151b955a7604e20f67be0b62c9c Mon Sep 17 00:00:00 2001 From: Johanna Aijala Date: Wed, 28 Nov 2018 15:33:40 +0200 Subject: [PATCH 05/12] Update Squish to 6.4.3 Froglogic has not yet released Squish for Qt5.13 but we can use Squish packages build with Qt5.12. Remove msvc12 Squish, not needed. Change-Id: I1de1bb67a5577fa7f7233c69c3a58bedd15fd16b Reviewed-by: Heikki Halmet --- .../provisioning/common/unix/squishInstall.sh | 4 +-- .../common/windows/squishInstall.ps1 | 28 ++++++++++--------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/coin/provisioning/common/unix/squishInstall.sh b/coin/provisioning/common/unix/squishInstall.sh index 4a7a6837..b40c1922 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.2" +version="6.4.3" # Branch version without dot -qtBranch="510x" +qtBranch="512x" 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 5fb032f5..21dfea39 100644 --- a/coin/provisioning/common/windows/squishInstall.ps1 +++ b/coin/provisioning/common/windows/squishInstall.ps1 @@ -38,18 +38,18 @@ # NOTE! Make sure 64bit versions are always installed before 32bit, # because they use same folder name before a rename -$version = "6.3.2" +$version = "6.4.3" # Qt branch without dot (*.*) -$qtBranch = "510x" -# So far Squish built with Qt5.10 works also with 5.11, but we have to be prepared that on some point +$qtBranch = "512x" +# So far Squish built with Qt5.12 works also with 5.13, 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" $squishUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin" $squishBranchUrl = "$squishUrl\$qtBranch" $testSuite = "suite_test_squish" -$testSuiteUrl = "\\ci-files01-hki.intra.qt.io\provisioning\squish\coin\$testSuite.7z" +$testSuiteUrl = "$squishUrl\$testSuite.7z" # Squish license $licensePackage = ".squish-3-license" @@ -62,7 +62,10 @@ Function DownloadAndInstallSquish { [string]$bit, [string]$squishPackage ) - + # MinGW x86 available only with Qt5.11, to be updated when Squish is supporting 5.13 + if ("$bit" -eq "win32" -and $squishPackage.StartsWith("mingw")) { + $qtBranch = "511x" + } $SquishUrl = $squishBranchUrl + "\squish-" + $version + "-qt" + $qtBranch + "-" + $bit + "-" + $squishPackage + ".exe" $SquishInstaller = "$targetDir\$squishPackage.exe" $SquishParameters = "unattended=1 targetdir=$targetDir\$squishPackage" @@ -125,25 +128,24 @@ DownloadSquishLicence $squishUrl if ($OSVersion -eq "Windows 10 Enterprise") { if (Is64BitWinHost) { - DownloadAndInstallSquish $version win64 msvc14 + DownloadAndInstallSquish $version win64 "msvc14" + DownloadAndInstallSquish $version win64 "mingw_gcc73_posix_seh" + } else { + DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf" } - DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf" - DownloadAndInstallSquish $version win32 "msvc14" + DownloadAndInstallSquish $version win32 "msvc141" } elseif ($OSVersion -eq "Windows 8.1 Enterprise") { if (Is64BitWinHost) { - DownloadAndInstallSquish $version win64 "msvc12" DownloadAndInstallSquish $version win64 "msvc14" } - DownloadAndInstallSquish $version win32 "msvc14" + DownloadAndInstallSquish $version win32 "msvc141" } elseif ($OSVersion -eq "Windows 7 Enterprise") { if (Is64BitWinHost) { - DownloadAndInstallSquish $version win64 "msvc12" DownloadAndInstallSquish $version win64 "msvc14" } - DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf" - DownloadAndInstallSquish $version win32 "msvc14" + DownloadAndInstallSquish $version win32 "msvc141" } From ec772e3e4a9fcf36fa1bb06c89fadc0fc32c338b Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 7 Mar 2019 21:21:56 +0100 Subject: [PATCH 06/12] Update submodules on '5.12' in qt5 Change-Id: Ie5d3cf0419efe268c3268fd4e5038c61677e57ea Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwebengine | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/qt3d b/qt3d index 22c66fa9..4af8fcdc 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 22c66fa9f7a460f077fede22f285c84276ce3883 +Subproject commit 4af8fcdc05d0198a569e7c39fa934614bbe31803 diff --git a/qtbase b/qtbase index ef5aefb0..e431a3ac 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit ef5aefb062bf8cbfb764f2deba731d3d64069099 +Subproject commit e431a3ac027915dbfc0588f42f3b56e07639811e diff --git a/qtcharts b/qtcharts index de84efac..203508d4 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit de84efac79724970bcdeac7fcdfe72a5fa846761 +Subproject commit 203508d4aff39cfb7d8a7f3192884a190f203020 diff --git a/qtconnectivity b/qtconnectivity index 1b19d798..3f9ba9c0 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 1b19d7981610c2a9587544da654b4ca783e1bf6b +Subproject commit 3f9ba9c07322d90f8f918d9e144e84d422e4cfbd diff --git a/qtdeclarative b/qtdeclarative index 783ec607..c911349b 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 783ec60774a565f3a16c25af076b720de0e6acbd +Subproject commit c911349b8bdcc7f798091eb6acd20395883b2000 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 9fdbdea1..73914e00 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 9fdbdea176007ed7b470e317e9002aa77ddd4ead +Subproject commit 73914e00dba2fe259108197d01b6744ce16b63d8 diff --git a/qtremoteobjects b/qtremoteobjects index 5f941451..7dd6dda4 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 5f94145128035bce167ca23780296564aa5f25d1 +Subproject commit 7dd6dda47a1eec17a7193455df1087c361d975b5 diff --git a/qttranslations b/qttranslations index 46220125..85e12b88 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 4622012565e28bffec22daff5fa81addece703e3 +Subproject commit 85e12b885e93a9f086b6a29f3cfb4a9a632013f4 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 81204883..eea791e1 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 81204883f671951371a8582008e1357634e7ff0f +Subproject commit eea791e14a4e2c94ba3ac292292b76b05d56385c diff --git a/qtwebengine b/qtwebengine index 56fadb57..2bf39d83 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 56fadb571f32b721d8b99554e6e38692009ec37f +Subproject commit 2bf39d83a532a7fa69adc99caafaa523276b03c5 From e403403b39113b625d67473691949df85d506bda Mon Sep 17 00:00:00 2001 From: Paul Wicking Date: Fri, 8 Mar 2019 14:04:31 +0100 Subject: [PATCH 07/12] Update clang-format config Set column width to 100 as described in the official Qt coding style (https://wiki.qt.io/Qt_Coding_Style). Also, break constructor initializers before the colon and after the commas. Change-Id: I6ac5a21ce831a35a0d74e699192ba981c8a8ba3c Reviewed-by: Frederik Gladhorn --- _clang-format | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/_clang-format b/_clang-format index ee000a1e..4cdda2fb 100644 --- a/_clang-format +++ b/_clang-format @@ -15,7 +15,7 @@ Standard: Cpp11 # Leave the line breaks up to the user. # Note that this may be changed at some point in the future. -ColumnLimit: 0 +ColumnLimit: 100 # How much weight do extra characters after the line length limit have. # PenaltyExcessCharacter: 4 @@ -77,4 +77,5 @@ SortIncludes: false # macros for which the opening brace stays attached. ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH, forever, Q_FOREVER, QBENCHMARK, QBENCHMARK_ONCE ] - +# Break constructor initializers before the colon and after the commas. +BreakConstructorInitializers: BeforeColon From afa1b053fed7c1be94f4f639d608479e9e39974d Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 8 Mar 2019 13:47:11 +0100 Subject: [PATCH 08/12] Update submodules on '5.12' in qt5 Change-Id: I324c45e79a1719943cdd8544a3ddbefc9394421c Reviewed-by: Liang Qi --- qtbase | 2 +- qtspeech | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtbase b/qtbase index e431a3ac..3702622d 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit e431a3ac027915dbfc0588f42f3b56e07639811e +Subproject commit 3702622dde060442534019bd99cbbf140391547b diff --git a/qtspeech b/qtspeech index 0711336d..ca42f92a 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 0711336d26804898393a99640e1442df7fd3828c +Subproject commit ca42f92ab22c26fbcd6b1408ef57ed5199313456 From 76c80866af78274eeb973ab38ad7b44f216b1a1e Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Fri, 15 Feb 2019 13:28:47 +0200 Subject: [PATCH 09/12] Provisioning: Help script for removing items MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sometimes items are locked (access denied) so we need to have function which waits and retry until removing is possible. Task-number: QTQAINFRA-2806 Change-Id: I09055c45c0e439ed1a20eb575ee79b7ca22c5745 Reviewed-by: Tony Sarajärvi Reviewed-by: Frederik Gladhorn --- coin/provisioning/common/windows/helpers.ps1 | 19 +++++++++++++++++++ .../provisioning/common/windows/vc_redist.ps1 | 3 +-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/common/windows/helpers.ps1 b/coin/provisioning/common/windows/helpers.ps1 index 76ad4867..f5318bcb 100644 --- a/coin/provisioning/common/windows/helpers.ps1 +++ b/coin/provisioning/common/windows/helpers.ps1 @@ -159,3 +159,22 @@ function IsProxyEnabled { function Get-Proxy { return (Get-ItemProperty -Path 'HKCU:\Software\Microsoft\Windows\CurrentVersion\Internet Settings').proxyServer } + +function Remove { + + Param ( + [string]$Path = $(BadParam("a path")) + ) + Write-Host "Removing $Path" + $i = 0 + While ( Test-Path($Path) ){ + Try{ + remove-item -Force -Recurse -Path $Path -ErrorAction Stop + }catch{ + $i +=1 + if ($i -eq 5) {exit 1} + Write-Verbose "$Path locked, trying again in 5" + Start-Sleep -seconds 5 + } + } +} diff --git a/coin/provisioning/common/windows/vc_redist.ps1 b/coin/provisioning/common/windows/vc_redist.ps1 index f68846f0..1cd81a37 100644 --- a/coin/provisioning/common/windows/vc_redist.ps1 +++ b/coin/provisioning/common/windows/vc_redist.ps1 @@ -57,5 +57,4 @@ Download $externalUrl $internalUrl $package Verify-Checksum $package $sha1 Write-Host "Installing $package..." Run-Executable $package "/q" -Write-Host "Remove $package..." -Remove-Item -Force -Path $package +Remove $package From f9c5acb2ffb1e25ef4e63bac17cf268c422108a1 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 10 Mar 2019 19:42:22 +0100 Subject: [PATCH 10/12] Update submodules on '5.12' in qt5 Change-Id: I4f983c014f06d1d396b13fde8e58d473bf5c988a Reviewed-by: Liang Qi --- qtbase | 2 +- qtgamepad | 2 +- qtquickcontrols2 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtbase b/qtbase index 3702622d..912bcf0f 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 3702622dde060442534019bd99cbbf140391547b +Subproject commit 912bcf0f0df166705f9bfd0a74ab6afcf7b42f1b diff --git a/qtgamepad b/qtgamepad index 8dd9ee5e..45feea99 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 8dd9ee5e2017cf5e5a5c970a62ddf4eaf2f5ba39 +Subproject commit 45feea99efe1b28b71b649b26790616a20f20d14 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 73914e00..1ef176b5 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 73914e00dba2fe259108197d01b6744ce16b63d8 +Subproject commit 1ef176b5da8ad8d4993fa9296e64e44ee8de6560 From cc1203311a530fc9e72d16b16f1c8649deb20a7d Mon Sep 17 00:00:00 2001 From: Paul Wicking Date: Sun, 10 Mar 2019 19:47:00 +0100 Subject: [PATCH 11/12] Update comment in clang-format file Change-Id: I18f14a1956f508317f8a3995873a14bc1af29594 Reviewed-by: Andy Maloney Reviewed-by: Lars Knoll --- _clang-format | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/_clang-format b/_clang-format index 4cdda2fb..c64ae331 100644 --- a/_clang-format +++ b/_clang-format @@ -13,7 +13,8 @@ BasedOnStyle: WebKit Standard: Cpp11 -# Leave the line breaks up to the user. +# Column width is limited to 100 in accordance with Qt Coding Style. +# https://wiki.qt.io/Qt_Coding_Style # Note that this may be changed at some point in the future. ColumnLimit: 100 # How much weight do extra characters after the line length limit have. From 675deb147463a9354aebd4a487783a41d578917c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johanna=20=C3=84ij=C3=A4l=C3=A4?= Date: Fri, 8 Mar 2019 07:41:10 -0800 Subject: [PATCH 12/12] Add Squish for MSVC2017 x64 to Win10 x64 machines Also Squish for MinGW x86 on Win7 x86. Change-Id: Ie73371b7993f94f32ef1cd2b90f340cf20935e0b Reviewed-by: Heikki Halmet --- coin/provisioning/common/windows/squishInstall.ps1 | 3 +++ 1 file changed, 3 insertions(+) diff --git a/coin/provisioning/common/windows/squishInstall.ps1 b/coin/provisioning/common/windows/squishInstall.ps1 index 21dfea39..de04d242 100644 --- a/coin/provisioning/common/windows/squishInstall.ps1 +++ b/coin/provisioning/common/windows/squishInstall.ps1 @@ -129,6 +129,7 @@ if ($OSVersion -eq "Windows 10 Enterprise") { if (Is64BitWinHost) { DownloadAndInstallSquish $version win64 "msvc14" + DownloadAndInstallSquish $version win64 "msvc141" DownloadAndInstallSquish $version win64 "mingw_gcc73_posix_seh" } else { DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf" @@ -146,6 +147,8 @@ if ($OSVersion -eq "Windows 10 Enterprise") { if (Is64BitWinHost) { DownloadAndInstallSquish $version win64 "msvc14" + } else { + DownloadAndInstallSquish $version win32 "mingw_gcc53_posix_dwarf" } DownloadAndInstallSquish $version win32 "msvc141" }