From 167e4fc36fb1866933241239d8261f72280b58fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Simo=20F=C3=A4lt?= Date: Thu, 5 Jan 2017 17:17:56 +0200 Subject: [PATCH 01/15] Provisioning: Disable Windows Defender This will reduct the timeouts coin has had recently with win machines. Change-Id: I32118f226194a3ea5e3c85d24103ec8341925d3c Reviewed-by: Simon Hausmann --- .../qtci-windows-10-x86/04-disable-windefender.ps1 | 5 +++++ .../qtci-windows-10-x86_64/04-disable-windefender.ps1 | 5 +++++ .../qtci-windows-7-x86/04-disable-windefender.ps1 | 5 +++++ .../qtci-windows-8-x86/04-disable-windefender.ps1 | 5 +++++ .../qtci-windows-8-x86_64/04-disable-windefender.ps1 | 5 +++++ 5 files changed, 25 insertions(+) create mode 100644 coin/provisioning/qtci-windows-10-x86/04-disable-windefender.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/04-disable-windefender.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86/04-disable-windefender.ps1 create mode 100644 coin/provisioning/qtci-windows-8-x86/04-disable-windefender.ps1 create mode 100644 coin/provisioning/qtci-windows-8-x86_64/04-disable-windefender.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86/04-disable-windefender.ps1 b/coin/provisioning/qtci-windows-10-x86/04-disable-windefender.ps1 new file mode 100644 index 00000000..2d1f0783 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/04-disable-windefender.ps1 @@ -0,0 +1,5 @@ +# Turning off win defender. +# +# If disabled manually, windows will automatically enable it after +# some period of time. Disabling it speeds up the builds. +REG ADD "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender" /V DisableAntiSpyware /T REG_dWORD /D 1 /F diff --git a/coin/provisioning/qtci-windows-10-x86_64/04-disable-windefender.ps1 b/coin/provisioning/qtci-windows-10-x86_64/04-disable-windefender.ps1 new file mode 100644 index 00000000..2d1f0783 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/04-disable-windefender.ps1 @@ -0,0 +1,5 @@ +# Turning off win defender. +# +# If disabled manually, windows will automatically enable it after +# some period of time. Disabling it speeds up the builds. +REG ADD "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender" /V DisableAntiSpyware /T REG_dWORD /D 1 /F diff --git a/coin/provisioning/qtci-windows-7-x86/04-disable-windefender.ps1 b/coin/provisioning/qtci-windows-7-x86/04-disable-windefender.ps1 new file mode 100644 index 00000000..2d1f0783 --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/04-disable-windefender.ps1 @@ -0,0 +1,5 @@ +# Turning off win defender. +# +# If disabled manually, windows will automatically enable it after +# some period of time. Disabling it speeds up the builds. +REG ADD "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender" /V DisableAntiSpyware /T REG_dWORD /D 1 /F diff --git a/coin/provisioning/qtci-windows-8-x86/04-disable-windefender.ps1 b/coin/provisioning/qtci-windows-8-x86/04-disable-windefender.ps1 new file mode 100644 index 00000000..2d1f0783 --- /dev/null +++ b/coin/provisioning/qtci-windows-8-x86/04-disable-windefender.ps1 @@ -0,0 +1,5 @@ +# Turning off win defender. +# +# If disabled manually, windows will automatically enable it after +# some period of time. Disabling it speeds up the builds. +REG ADD "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender" /V DisableAntiSpyware /T REG_dWORD /D 1 /F diff --git a/coin/provisioning/qtci-windows-8-x86_64/04-disable-windefender.ps1 b/coin/provisioning/qtci-windows-8-x86_64/04-disable-windefender.ps1 new file mode 100644 index 00000000..2d1f0783 --- /dev/null +++ b/coin/provisioning/qtci-windows-8-x86_64/04-disable-windefender.ps1 @@ -0,0 +1,5 @@ +# Turning off win defender. +# +# If disabled manually, windows will automatically enable it after +# some period of time. Disabling it speeds up the builds. +REG ADD "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender" /V DisableAntiSpyware /T REG_dWORD /D 1 /F From c5e6abcafa40507a99c4f6e0083d4da5b3425e5a Mon Sep 17 00:00:00 2001 From: Tony Sarajarvi Date: Fri, 7 Oct 2016 12:12:59 +0300 Subject: [PATCH 02/15] Add provisioning try-catch helper script for bash Change-Id: Ia61e503ed5315546421fdeb2f4b8b1be37dab3e9 Reviewed-by: Heikki Halmet --- coin/provisioning/common/try_catch.sh | 64 +++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 coin/provisioning/common/try_catch.sh diff --git a/coin/provisioning/common/try_catch.sh b/coin/provisioning/common/try_catch.sh new file mode 100644 index 00000000..b21861e3 --- /dev/null +++ b/coin/provisioning/common/try_catch.sh @@ -0,0 +1,64 @@ +#!/bin/bash + +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the test suite of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +echo "Sourcing try_catch.sh" + +function try() +{ + [[ $- = *e* ]]; SAVED_OPT_E=$? + set +e +} + +function throw() +{ + exit "$1" +} + +function catch() +{ + export ex_code=$? + (( SAVED_OPT_E )) && set +e + return $ex_code +} + +function throwErrors() +{ + set -e +} + +function ignoreErrors() +{ + set +e +} From 2b2188cc77d093df137d5e3e635ea06b433696a6 Mon Sep 17 00:00:00 2001 From: Tony Sarajarvi Date: Mon, 10 Oct 2016 11:55:31 +0300 Subject: [PATCH 03/15] Add DownloadURL.sh provisioning helper script Change-Id: I64bef8470555e33772b72847aa76e0e9b4720696 Reviewed-by: Heikki Halmet --- coin/provisioning/common/DownloadURL.sh | 85 +++++++++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100644 coin/provisioning/common/DownloadURL.sh diff --git a/coin/provisioning/common/DownloadURL.sh b/coin/provisioning/common/DownloadURL.sh new file mode 100644 index 00000000..9bf7fdb7 --- /dev/null +++ b/coin/provisioning/common/DownloadURL.sh @@ -0,0 +1,85 @@ +#!/bin/bash + +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the test suite of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +# A helper script used for downloading a file from a URL or an alternative +# URL. Also the SHA1 is checked for the file. Target filename should also +# be given. +# +# If called directly from another script, it will exit the parent script +# as well, if not called in its own subshell with parentheses. + +# shellcheck source=try_catch.sh +source "${BASH_SOURCE%/*}/try_catch.sh" + +ExceptionDownloadPrimaryUrl=100 +ExceptionDownloadAltUrl=101 +ExceptionSHA1=102 + +function DownloadURL { + url=$1 + url_alt=$2 + expectedSha1=$3 + targetFile=$4 + + try + ( + try + ( + echo "Downloading from primary URL '$url'" + curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url" || throw $ExceptionDownloadPrimaryUrl + ) + catch || { + case $ex_code in + $ExceptionDownloadPrimaryUrl) + echo "Failed to download '$url' multiple times" + echo "Downloading tar.gz from alternative URL '$url_alt'" + curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url_alt" || throw $ExceptionDownloadAltUrl + ;; + esac + } + echo "Checking SHA1 on PKG '$targetFile'" + echo "$expectedSha1 *$targetFile" | shasum --check || throw $ExceptionSHA1 + ) + + catch || { + case $ex_code in + $ExceptionDownloadAltUrl) + echo "Failed downloading PKG from primary and alternative URLs" + exit 1; + ;; + esac + } +} + From 17c97ea79ae578c6c062a6a7b72aef010f214cd5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Thu, 24 Nov 2016 13:21:33 +0200 Subject: [PATCH 04/15] Add provision helper file to install compressed packages Change-Id: I6a7e1af7c91bd11a0cc6379f8bb7762acf42eae5 Reviewed-by: Heikki Halmet --- .../InstallFromCompressedFileFromURL.sh | 120 ++++++++++++++++++ 1 file changed, 120 insertions(+) create mode 100644 coin/provisioning/common/InstallFromCompressedFileFromURL.sh diff --git a/coin/provisioning/common/InstallFromCompressedFileFromURL.sh b/coin/provisioning/common/InstallFromCompressedFileFromURL.sh new file mode 100644 index 00000000..1f097d32 --- /dev/null +++ b/coin/provisioning/common/InstallFromCompressedFileFromURL.sh @@ -0,0 +1,120 @@ +#!/bin/bash + +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the test suite of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +# shellcheck source=try_catch.sh +source "${BASH_SOURCE%/*}/try_catch.sh" +# shellcheck source=DownloadURL.sh +source "${BASH_SOURCE%/*}/DownloadURL.sh" + +ExceptionCreateTmpFile=100 +ExceptionCreateTmpDirectory=101 +ExceptionUncompress=102 +ExceptionMoveApp=103 +ExceptionDeleteTmpFile=104 +ExceptionRemoveTmpDirectory=105 +ExceptionUnknownFormat=106 + + +function InstallFromCompressedFileFromURL { + url=$1 + url_alt=$2 + expectedSha1=$3 + installDirectory=$4 + appPrefix=$5 + + try + ( + basefilename=${url##*/} + extension=${basefilename##*.} + filename=${basefilename%.*} + if [ "$extension" == "gz" ] && [ "${filename##*.}" == "tar" ]; then + extension="tar.gz" + fi + echo "Extension for file: $extension" + echo "Creating temporary file and directory" + targetFile=$(mktemp "$TMPDIR$(uuidgen)XXXXX.$extension") || throw $ExceptionCreateTmpFile + targetDirectory=$(mktemp -d) || throw $ExceptionCreateTmpDirectory + DownloadURL "$url" "$url_alt" "$expectedSha1" "$targetFile" + echo "Uncompress $targetFile" + case $extension in + "tar.gz") + tar -xzf "$targetFile" --directory "$targetDirectory" || throw $ExceptionUncompress + ;; + "zip") + unzip "$targetFile" -d "$targetDirectory" || throw $ExceptionUncompress + ;; + *) + throw $ExceptionUnknownFormat + ;; + esac + echo "Moving app to $installDirectory" + sudo mkdir "$installDirectory" + sudo mv "$targetDirectory/$appPrefix/"* "$installDirectory" || throw $ExceptionMoveApp + echo "Removing file '$targetFile'" + rm "$targetFile" || throw $ExceptionDeleteTmpFile + echo "Removing directory '$targetDirectory'" + rm -rf "$targetDirectory" || throw $ExceptionRemoveTmpDirectory + ) + + catch || { + case $ex_code in + $ExceptionCreateTmpFile) + echo "Failed to create temporary file" + exit 1; + ;; + $ExceptionUncompress) + echo "Failed extracting compressed file." + exit 1; + ;; + $ExceptionMoveApp) + echo "Failed moving app to target location." + exit 1; + ;; + $ExceptionDeleteTmpFile) + echo "Failed deleting temporary file." + exit 1; + ;; + $ExceptionRemoveTmpDirectory) + echo "Failed deleting temporary file." + exit 1; + ;; + $ExceptionUnknownFormat) + echo "Unknown file format." + exit 1; + ;; + esac + } +} + From 5f40fd649e5f3a4402125a7a26035396a2e72397 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Thu, 29 Dec 2016 19:47:22 +0100 Subject: [PATCH 05/15] Improve build performance on Windows MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Disable the windows search indexing service, which has a tendency to start indexing source code archives that we've just extracted. We are not interested in this service. Change-Id: I1d3f5178a035bc951499d993641a9315db9712ca Reviewed-by: Jędrzej Nowacki --- coin/provisioning/qtci-windows-10-x86/05-wsearch-off.ps1 | 3 +++ coin/provisioning/qtci-windows-10-x86_64/05-wsearch-off.ps1 | 3 +++ coin/provisioning/qtci-windows-7-x86/05-wsearch-off.ps1 | 3 +++ coin/provisioning/qtci-windows-8-x86/05-wsearch-off.ps1 | 3 +++ coin/provisioning/qtci-windows-8-x86_64/05-wsearch-off.ps1 | 3 +++ 5 files changed, 15 insertions(+) create mode 100644 coin/provisioning/qtci-windows-10-x86/05-wsearch-off.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/05-wsearch-off.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86/05-wsearch-off.ps1 create mode 100644 coin/provisioning/qtci-windows-8-x86/05-wsearch-off.ps1 create mode 100644 coin/provisioning/qtci-windows-8-x86_64/05-wsearch-off.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86/05-wsearch-off.ps1 b/coin/provisioning/qtci-windows-10-x86/05-wsearch-off.ps1 new file mode 100644 index 00000000..09c45bbd --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/05-wsearch-off.ps1 @@ -0,0 +1,3 @@ + +# Disable the windows search indexing service +sc.exe config WSearch start= disabled diff --git a/coin/provisioning/qtci-windows-10-x86_64/05-wsearch-off.ps1 b/coin/provisioning/qtci-windows-10-x86_64/05-wsearch-off.ps1 new file mode 100644 index 00000000..09c45bbd --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/05-wsearch-off.ps1 @@ -0,0 +1,3 @@ + +# Disable the windows search indexing service +sc.exe config WSearch start= disabled diff --git a/coin/provisioning/qtci-windows-7-x86/05-wsearch-off.ps1 b/coin/provisioning/qtci-windows-7-x86/05-wsearch-off.ps1 new file mode 100644 index 00000000..09c45bbd --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/05-wsearch-off.ps1 @@ -0,0 +1,3 @@ + +# Disable the windows search indexing service +sc.exe config WSearch start= disabled diff --git a/coin/provisioning/qtci-windows-8-x86/05-wsearch-off.ps1 b/coin/provisioning/qtci-windows-8-x86/05-wsearch-off.ps1 new file mode 100644 index 00000000..09c45bbd --- /dev/null +++ b/coin/provisioning/qtci-windows-8-x86/05-wsearch-off.ps1 @@ -0,0 +1,3 @@ + +# Disable the windows search indexing service +sc.exe config WSearch start= disabled diff --git a/coin/provisioning/qtci-windows-8-x86_64/05-wsearch-off.ps1 b/coin/provisioning/qtci-windows-8-x86_64/05-wsearch-off.ps1 new file mode 100644 index 00000000..09c45bbd --- /dev/null +++ b/coin/provisioning/qtci-windows-8-x86_64/05-wsearch-off.ps1 @@ -0,0 +1,3 @@ + +# Disable the windows search indexing service +sc.exe config WSearch start= disabled From 96a8c36ee865fdd641ec16d2f49ce8723c58aed3 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Tue, 10 Jan 2017 15:58:12 +0100 Subject: [PATCH 06/15] Update submodules on '5.8' in qt5 Change-Id: I0d6757349b933d131aa0eef501dc3e1509a545c4 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 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebkit | 2 +- qtwebkit-examples | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 40 files changed, 40 insertions(+), 40 deletions(-) diff --git a/qt3d b/qt3d index e90e10ef..8adaeea5 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit e90e10efbaaac87cb4f7a642b0b835c6a5f1434d +Subproject commit 8adaeea5a706779de384cf4a8e9c4fec431b6734 diff --git a/qtactiveqt b/qtactiveqt index 8fd5468c..b36beaa4 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 8fd5468ca2210d7e6bd515698f264e41368819fd +Subproject commit b36beaa453fb855e943205ad28155e1b120c364a diff --git a/qtandroidextras b/qtandroidextras index 86c02b98..c9175b82 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 86c02b9839fc9969ac6efb393b7838513955e3ab +Subproject commit c9175b821526a94300f16770cadbd88a0f73acd9 diff --git a/qtbase b/qtbase index 7957d0fb..ecb025e3 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 7957d0fbd71767055b1fa408d3a05d3892718c84 +Subproject commit ecb025e346b662548a5dec51eda61f0c812a4f57 diff --git a/qtcanvas3d b/qtcanvas3d index 69b9f0de..2041335c 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 69b9f0de3d805a32e08533502ca5503901a4c555 +Subproject commit 2041335c66a20820d55b26368e0c86d6de5d478a diff --git a/qtcharts b/qtcharts index a5b0ab93..0a3e9460 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit a5b0ab930e595b7f1e24d5648bdda7872fc7980b +Subproject commit 0a3e9460c8a54061a6e858e6e65c4b5ea0a8a093 diff --git a/qtconnectivity b/qtconnectivity index b1e86c68..2df17b2a 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit b1e86c68d1154220a664efebf22e29eeb6a3fe99 +Subproject commit 2df17b2a0c050df98bd87a3dff218096ec84b2fb diff --git a/qtdatavis3d b/qtdatavis3d index 27fe1a15..beb420e3 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 27fe1a1564357a13c408a46523c3e18b060a470b +Subproject commit beb420e3995010b5729608922022e65558f58764 diff --git a/qtdeclarative b/qtdeclarative index 0f911e46..208e1189 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 0f911e46c5ccff88ade99366d7e15e1436360391 +Subproject commit 208e118924d648a472dafd18d11f3404e30ad8be diff --git a/qtdoc b/qtdoc index 8867a493..2e764d83 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 8867a493aef4de6a409a1b0114a82b5e6045775b +Subproject commit 2e764d83cffa156a3172cd698e7d121868729aa4 diff --git a/qtgamepad b/qtgamepad index dc599eca..2c55174f 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit dc599eca071d545aab3f6a5c854911cac9585a57 +Subproject commit 2c55174f267fccdd6bf74171b0da312f895c5a62 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 86368278..254be077 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 863682782bd7ba3edc33d3e13938437af0637320 +Subproject commit 254be077bc20f4eb68cc4cc3e44eab8d20cd4f55 diff --git a/qtimageformats b/qtimageformats index caaa463a..0870e670 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit caaa463a3e08cf006990dc855c0374671143e116 +Subproject commit 0870e670665a702665948723bb7b1eb61a9572a8 diff --git a/qtlocation b/qtlocation index b3422d4a..9643b177 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit b3422d4a4460f19d34611f413bea77b332838139 +Subproject commit 9643b177a9c63d97d3854b2ed0325f4b8f4e1df1 diff --git a/qtmacextras b/qtmacextras index 844ad02c..733d54a6 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 844ad02c5d7ba8feec23f51a6338d1a202d6fc60 +Subproject commit 733d54a6a9522b31c38c973690c3df24d033c805 diff --git a/qtmultimedia b/qtmultimedia index 38ebe437..4902bfcb 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 38ebe4372ca7017b4ed7f477cc6532efcf5fdceb +Subproject commit 4902bfcbd619e9383ecd2e1b364d4fb1903989db diff --git a/qtnetworkauth b/qtnetworkauth index 35291fa6..591fe512 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 35291fa676359588fedd9b821328e91fff8511e6 +Subproject commit 591fe512e3a65877441b4adbf51f388dc4991e7e diff --git a/qtpurchasing b/qtpurchasing index e78e73df..e46edb68 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit e78e73dfaf46c1a9b5906765ba3665b42a447789 +Subproject commit e46edb689a634a2559e867c67f51a00ffc562091 diff --git a/qtquickcontrols b/qtquickcontrols index 84b48cad..08d0ec79 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 84b48cadc8f68d57d1a750e6aec690f46582e0c5 +Subproject commit 08d0ec79897ea2b9ba830f66f8b2ecfbce8723e1 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index b1ea82e4..00a06264 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit b1ea82e473324ddba0ab2ed2e5e4993b17625436 +Subproject commit 00a062649b8aec20c3ac3f61aa72b1cdde43b055 diff --git a/qtscript b/qtscript index 89ec4f43..cec2c4c5 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 89ec4f43b1fd3967fce4efa4b885662328c3f768 +Subproject commit cec2c4c5fbcc75a990cfc529f2174e0df26b0b2d diff --git a/qtscxml b/qtscxml index 51db93cf..0a4715a6 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 51db93cf783662a155ced91dceef7508ffa955a6 +Subproject commit 0a4715a6d2a3bd98eed3ced4d6eeef887c1dd0b6 diff --git a/qtsensors b/qtsensors index 2c595c38..04c42632 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 2c595c382c50a5632b14eda00d85a9b7fcb09b5d +Subproject commit 04c42632315ee4e9ac22003b572d4877fcbd33f9 diff --git a/qtserialbus b/qtserialbus index f3cb65ad..7408955f 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit f3cb65adffa43b337df8f8298091db46c1fbfa24 +Subproject commit 7408955f6d44b33403cd6419f8a6452d66ce16a5 diff --git a/qtserialport b/qtserialport index f23aa97a..f6405215 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit f23aa97aeca62d9ddcc753ab97fa3b6c297db5b9 +Subproject commit f640521532087dc76d36b25a6c49b2f64afcd4de diff --git a/qtspeech b/qtspeech index 48b130f5..483208af 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 48b130f51f15ef3a0cf4ed33a1b9a42204f2e8d2 +Subproject commit 483208aff4f583df2c9c14d0d549c39d68481196 diff --git a/qtsvg b/qtsvg index eb749198..5f5b5f58 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit eb74919884f14c0ceebb63d512768ea1c8823b84 +Subproject commit 5f5b5f58a976825c883a772d19beac21aaf4dd1d diff --git a/qttools b/qttools index 1ea5035a..980fbea7 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 1ea5035ad0f663baa3bbc9880a8dd3d4473803e9 +Subproject commit 980fbea7adb3d31b8017f844bc8856612d3f7cff diff --git a/qttranslations b/qttranslations index 31c7540b..f9774825 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 31c7540bdc75d2069ccdb998af51513e3cd71ca6 +Subproject commit f97748255437acc0548b9d803467162f39df7a27 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index a4c0385a..9beed885 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit a4c0385a15c29ae56fcad82330699e9058c609e2 +Subproject commit 9beed8859bcf78f5d4cff04be07f1ef52f266881 diff --git a/qtwayland b/qtwayland index c9ba2178..5e6259b0 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit c9ba2178388b6a1b68eae69709d989d6d4f19d9b +Subproject commit 5e6259b09326022324709c44ad533d004056e048 diff --git a/qtwebchannel b/qtwebchannel index 8cc9153f..87d83df5 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 8cc9153f413c36d505794adfaca4f4724692fa81 +Subproject commit 87d83df5f3fa2a582385e70dc22c4a9789134f99 diff --git a/qtwebengine b/qtwebengine index e2609bcb..017cf5e6 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit e2609bcba621110920d847fcfbaf7edec4ae3827 +Subproject commit 017cf5e691290fb667847866e68e84ec3fcdb516 diff --git a/qtwebkit b/qtwebkit index c6a621db..a0c60c53 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit c6a621dba39fdcb5d1c05eb5160e59d3ace6e179 +Subproject commit a0c60c53c0fe1b1f6b5ab52944e031a3684e3de1 diff --git a/qtwebkit-examples b/qtwebkit-examples index 18418904..ac8c2122 160000 --- a/qtwebkit-examples +++ b/qtwebkit-examples @@ -1 +1 @@ -Subproject commit 184189043bb69a0f14dd019e708decc98a4385f9 +Subproject commit ac8c2122bba9e2ba8887fb5586ca4a8a119cc404 diff --git a/qtwebsockets b/qtwebsockets index 503a1353..670266a0 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 503a1353dcf23f8a5fcb8a2c79d55f707e75cf33 +Subproject commit 670266a075c7c312c6a7f9465298bfec0b968ee2 diff --git a/qtwebview b/qtwebview index 22697dac..241fe52a 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 22697dac66be3d380540546dfe7d68094befb560 +Subproject commit 241fe52ae9531f7fad0a5ca1af0bda5a1e5724c7 diff --git a/qtwinextras b/qtwinextras index ac32e1ed..a8bd3176 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit ac32e1ed4c5f83dfbef3ee5ac8b8c37852269f85 +Subproject commit a8bd317652bf44d37ba97033f8c24b64fbae6419 diff --git a/qtx11extras b/qtx11extras index aa43efab..3cb215e9 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit aa43efab9b7a9bad002ebc5e2ede061f641cb90e +Subproject commit 3cb215e9b988795d6222c9dac38e1a12d00ba838 diff --git a/qtxmlpatterns b/qtxmlpatterns index 594ad16a..b7f8783f 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 594ad16ae17072a44219228783f2ae051f88eba0 +Subproject commit b7f8783f25cf1ff0eadbab59701acd46bff58e9a From da48107b0852561c2daad9465c80408d4392baf1 Mon Sep 17 00:00:00 2001 From: Tony Sarajarvi Date: Fri, 7 Oct 2016 12:12:59 +0300 Subject: [PATCH 07/15] Add provisioning try-catch helper script for bash MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ia61e503ed5315546421fdeb2f4b8b1be37dab3e9 Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/try_catch.sh | 64 +++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 coin/provisioning/common/try_catch.sh diff --git a/coin/provisioning/common/try_catch.sh b/coin/provisioning/common/try_catch.sh new file mode 100644 index 00000000..b21861e3 --- /dev/null +++ b/coin/provisioning/common/try_catch.sh @@ -0,0 +1,64 @@ +#!/bin/bash + +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the test suite of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +echo "Sourcing try_catch.sh" + +function try() +{ + [[ $- = *e* ]]; SAVED_OPT_E=$? + set +e +} + +function throw() +{ + exit "$1" +} + +function catch() +{ + export ex_code=$? + (( SAVED_OPT_E )) && set +e + return $ex_code +} + +function throwErrors() +{ + set -e +} + +function ignoreErrors() +{ + set +e +} From 2059ce3d2d11c515b0b932d9c511d1a6793b63f2 Mon Sep 17 00:00:00 2001 From: Tony Sarajarvi Date: Mon, 10 Oct 2016 11:55:31 +0300 Subject: [PATCH 08/15] Add DownloadURL.sh provisioning helper script MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I64bef8470555e33772b72847aa76e0e9b4720696 Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/DownloadURL.sh | 85 +++++++++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100644 coin/provisioning/common/DownloadURL.sh diff --git a/coin/provisioning/common/DownloadURL.sh b/coin/provisioning/common/DownloadURL.sh new file mode 100644 index 00000000..9bf7fdb7 --- /dev/null +++ b/coin/provisioning/common/DownloadURL.sh @@ -0,0 +1,85 @@ +#!/bin/bash + +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the test suite of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +# A helper script used for downloading a file from a URL or an alternative +# URL. Also the SHA1 is checked for the file. Target filename should also +# be given. +# +# If called directly from another script, it will exit the parent script +# as well, if not called in its own subshell with parentheses. + +# shellcheck source=try_catch.sh +source "${BASH_SOURCE%/*}/try_catch.sh" + +ExceptionDownloadPrimaryUrl=100 +ExceptionDownloadAltUrl=101 +ExceptionSHA1=102 + +function DownloadURL { + url=$1 + url_alt=$2 + expectedSha1=$3 + targetFile=$4 + + try + ( + try + ( + echo "Downloading from primary URL '$url'" + curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url" || throw $ExceptionDownloadPrimaryUrl + ) + catch || { + case $ex_code in + $ExceptionDownloadPrimaryUrl) + echo "Failed to download '$url' multiple times" + echo "Downloading tar.gz from alternative URL '$url_alt'" + curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url_alt" || throw $ExceptionDownloadAltUrl + ;; + esac + } + echo "Checking SHA1 on PKG '$targetFile'" + echo "$expectedSha1 *$targetFile" | shasum --check || throw $ExceptionSHA1 + ) + + catch || { + case $ex_code in + $ExceptionDownloadAltUrl) + echo "Failed downloading PKG from primary and alternative URLs" + exit 1; + ;; + esac + } +} + From 8266919b6e61ee859ba9469da0cb6309cb7b3b68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Thu, 24 Nov 2016 13:21:33 +0200 Subject: [PATCH 09/15] Add provision helper file to install compressed packages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I6a7e1af7c91bd11a0cc6379f8bb7762acf42eae5 Reviewed-by: Tony Sarajärvi --- .../InstallFromCompressedFileFromURL.sh | 120 ++++++++++++++++++ 1 file changed, 120 insertions(+) create mode 100644 coin/provisioning/common/InstallFromCompressedFileFromURL.sh diff --git a/coin/provisioning/common/InstallFromCompressedFileFromURL.sh b/coin/provisioning/common/InstallFromCompressedFileFromURL.sh new file mode 100644 index 00000000..1f097d32 --- /dev/null +++ b/coin/provisioning/common/InstallFromCompressedFileFromURL.sh @@ -0,0 +1,120 @@ +#!/bin/bash + +############################################################################# +## +## Copyright (C) 2017 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the test suite of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +# shellcheck source=try_catch.sh +source "${BASH_SOURCE%/*}/try_catch.sh" +# shellcheck source=DownloadURL.sh +source "${BASH_SOURCE%/*}/DownloadURL.sh" + +ExceptionCreateTmpFile=100 +ExceptionCreateTmpDirectory=101 +ExceptionUncompress=102 +ExceptionMoveApp=103 +ExceptionDeleteTmpFile=104 +ExceptionRemoveTmpDirectory=105 +ExceptionUnknownFormat=106 + + +function InstallFromCompressedFileFromURL { + url=$1 + url_alt=$2 + expectedSha1=$3 + installDirectory=$4 + appPrefix=$5 + + try + ( + basefilename=${url##*/} + extension=${basefilename##*.} + filename=${basefilename%.*} + if [ "$extension" == "gz" ] && [ "${filename##*.}" == "tar" ]; then + extension="tar.gz" + fi + echo "Extension for file: $extension" + echo "Creating temporary file and directory" + targetFile=$(mktemp "$TMPDIR$(uuidgen)XXXXX.$extension") || throw $ExceptionCreateTmpFile + targetDirectory=$(mktemp -d) || throw $ExceptionCreateTmpDirectory + DownloadURL "$url" "$url_alt" "$expectedSha1" "$targetFile" + echo "Uncompress $targetFile" + case $extension in + "tar.gz") + tar -xzf "$targetFile" --directory "$targetDirectory" || throw $ExceptionUncompress + ;; + "zip") + unzip "$targetFile" -d "$targetDirectory" || throw $ExceptionUncompress + ;; + *) + throw $ExceptionUnknownFormat + ;; + esac + echo "Moving app to $installDirectory" + sudo mkdir "$installDirectory" + sudo mv "$targetDirectory/$appPrefix/"* "$installDirectory" || throw $ExceptionMoveApp + echo "Removing file '$targetFile'" + rm "$targetFile" || throw $ExceptionDeleteTmpFile + echo "Removing directory '$targetDirectory'" + rm -rf "$targetDirectory" || throw $ExceptionRemoveTmpDirectory + ) + + catch || { + case $ex_code in + $ExceptionCreateTmpFile) + echo "Failed to create temporary file" + exit 1; + ;; + $ExceptionUncompress) + echo "Failed extracting compressed file." + exit 1; + ;; + $ExceptionMoveApp) + echo "Failed moving app to target location." + exit 1; + ;; + $ExceptionDeleteTmpFile) + echo "Failed deleting temporary file." + exit 1; + ;; + $ExceptionRemoveTmpDirectory) + echo "Failed deleting temporary file." + exit 1; + ;; + $ExceptionUnknownFormat) + echo "Unknown file format." + exit 1; + ;; + esac + } +} + From 2cf8327999056995e1221ee07e99532e5436b37c Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Mon, 7 Nov 2016 10:13:22 +0200 Subject: [PATCH 10/15] Provision: Cmake 3.6.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Red Hat 6.6 needs cmake for GammaRay OpenSUSE 42.1 and Ubuntu 14.04 needs cmake for pyside Change-Id: I64b25be70057b86be7bfc96fb07446f7727bbefe Reviewed-by: Tony Sarajärvi --- .../qtci-linux-RHEL-6.6-x86_64/09-cmake.sh | 53 +++++++++++++++++++ .../qtci-linux-RHEL-7.2-x86_64/09-cmake.sh | 53 +++++++++++++++++++ .../09-cmake.sh | 53 +++++++++++++++++++ .../09-cmake.sh | 53 +++++++++++++++++++ 4 files changed, 212 insertions(+) create mode 100644 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh create mode 100644 coin/provisioning/qtci-linux-RHEL-7.2-x86_64/09-cmake.sh create mode 100644 coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/09-cmake.sh create mode 100644 coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/09-cmake.sh diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh new file mode 100644 index 00000000..dd35e01d --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/09-cmake.sh @@ -0,0 +1,53 @@ +#!/bin/bash + +############################################################################# +## +## Copyright (C) 2016 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the test suite of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +# This script installs CMake 3.6.2 + +# CMake is needed for autotests that verify that Qt can be built with CMake + +# shellcheck source=../common/InstallFromCompressedFileFromURL.sh +source "${BASH_SOURCE%/*}/../common/InstallFromCompressedFileFromURL.sh" + +version="3.6.2" +PrimaryUrl="http://ci-files01-hki.ci.local/input/cmake/cmake-3.6.2-Linux-x86_64.tar.gz" +AltUrl="https://cmake.org/files/v3.6/cmake-3.6.2-Linux-x86_64.tar.gz" +SHA1="dd9d8d57b66109d4bac6eef9209beb94608a185c" +targetFolder="/opt/cmake-$version" +appPrefix="cmake-$version-Linux-x86_64" + +InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix" + +echo "Adding $targetFolder/bin to PATH" +echo "export PATH=$targetFolder/bin:$PATH" >> ~/.bashrc diff --git a/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/09-cmake.sh b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/09-cmake.sh new file mode 100644 index 00000000..dd35e01d --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.2-x86_64/09-cmake.sh @@ -0,0 +1,53 @@ +#!/bin/bash + +############################################################################# +## +## Copyright (C) 2016 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the test suite of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +# This script installs CMake 3.6.2 + +# CMake is needed for autotests that verify that Qt can be built with CMake + +# shellcheck source=../common/InstallFromCompressedFileFromURL.sh +source "${BASH_SOURCE%/*}/../common/InstallFromCompressedFileFromURL.sh" + +version="3.6.2" +PrimaryUrl="http://ci-files01-hki.ci.local/input/cmake/cmake-3.6.2-Linux-x86_64.tar.gz" +AltUrl="https://cmake.org/files/v3.6/cmake-3.6.2-Linux-x86_64.tar.gz" +SHA1="dd9d8d57b66109d4bac6eef9209beb94608a185c" +targetFolder="/opt/cmake-$version" +appPrefix="cmake-$version-Linux-x86_64" + +InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix" + +echo "Adding $targetFolder/bin to PATH" +echo "export PATH=$targetFolder/bin:$PATH" >> ~/.bashrc diff --git a/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/09-cmake.sh b/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/09-cmake.sh new file mode 100644 index 00000000..dd35e01d --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-14.04-x86_64/09-cmake.sh @@ -0,0 +1,53 @@ +#!/bin/bash + +############################################################################# +## +## Copyright (C) 2016 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the test suite of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +# This script installs CMake 3.6.2 + +# CMake is needed for autotests that verify that Qt can be built with CMake + +# shellcheck source=../common/InstallFromCompressedFileFromURL.sh +source "${BASH_SOURCE%/*}/../common/InstallFromCompressedFileFromURL.sh" + +version="3.6.2" +PrimaryUrl="http://ci-files01-hki.ci.local/input/cmake/cmake-3.6.2-Linux-x86_64.tar.gz" +AltUrl="https://cmake.org/files/v3.6/cmake-3.6.2-Linux-x86_64.tar.gz" +SHA1="dd9d8d57b66109d4bac6eef9209beb94608a185c" +targetFolder="/opt/cmake-$version" +appPrefix="cmake-$version-Linux-x86_64" + +InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix" + +echo "Adding $targetFolder/bin to PATH" +echo "export PATH=$targetFolder/bin:$PATH" >> ~/.bashrc diff --git a/coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/09-cmake.sh b/coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/09-cmake.sh new file mode 100644 index 00000000..dd35e01d --- /dev/null +++ b/coin/provisioning/qtci-linux-openSUSE-42.1-x86_64/09-cmake.sh @@ -0,0 +1,53 @@ +#!/bin/bash + +############################################################################# +## +## Copyright (C) 2016 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the test suite of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +# This script installs CMake 3.6.2 + +# CMake is needed for autotests that verify that Qt can be built with CMake + +# shellcheck source=../common/InstallFromCompressedFileFromURL.sh +source "${BASH_SOURCE%/*}/../common/InstallFromCompressedFileFromURL.sh" + +version="3.6.2" +PrimaryUrl="http://ci-files01-hki.ci.local/input/cmake/cmake-3.6.2-Linux-x86_64.tar.gz" +AltUrl="https://cmake.org/files/v3.6/cmake-3.6.2-Linux-x86_64.tar.gz" +SHA1="dd9d8d57b66109d4bac6eef9209beb94608a185c" +targetFolder="/opt/cmake-$version" +appPrefix="cmake-$version-Linux-x86_64" + +InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix" + +echo "Adding $targetFolder/bin to PATH" +echo "export PATH=$targetFolder/bin:$PATH" >> ~/.bashrc From 4b6bff80442cd25ff7178aa5b033e9e1ab78e61b Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 11 Jan 2017 06:50:51 +0100 Subject: [PATCH 11/15] Update submodules on '5.8' in qt5 Change-Id: I413f02de39f18259ab7bb10054ff75dc0ed04ed0 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtwebengine | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qt3d b/qt3d index 8adaeea5..a4ab9962 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 8adaeea5a706779de384cf4a8e9c4fec431b6734 +Subproject commit a4ab9962239c692b302f0d75cfdec96359a8d33e diff --git a/qtbase b/qtbase index ecb025e3..22138f59 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit ecb025e346b662548a5dec51eda61f0c812a4f57 +Subproject commit 22138f59075ccc5dce8ee0c96ffbb7b5454bb561 diff --git a/qtdeclarative b/qtdeclarative index 208e1189..046d1a09 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 208e118924d648a472dafd18d11f3404e30ad8be +Subproject commit 046d1a092b7b1ce7cb615d5e5e080a1cf8e41e10 diff --git a/qtwebengine b/qtwebengine index 017cf5e6..ceff67e0 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 017cf5e691290fb667847866e68e84ec3fcdb516 +Subproject commit ceff67e0bab4d34c5b791d1f1b1d43c7a4e44d84 From 3035f20934121effa6dd3476d6f884e81c689180 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Wed, 11 Jan 2017 11:59:43 +0100 Subject: [PATCH 12/15] Add CI build configurations MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These files were previously stored in the CI source tree, but they do belong here. They describe the different configurations under which we want to build Qt and its submodules, in terms of underlying virtual machine template, host OS, target OS and CI related features that may also map to Qt configuration features. Task-number: QTQAINFRA-1074 Change-Id: I7ce48e3b15da757166eeac7531478d3746c8aa7f Reviewed-by: Jędrzej Nowacki --- coin/platform_configs/default.txt | 26 ++++++++++++++++++++++++++ coin/platform_configs/qt5.txt | 17 +++++++++++++++++ 2 files changed, 43 insertions(+) create mode 100644 coin/platform_configs/default.txt create mode 100644 coin/platform_configs/qt5.txt diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt new file mode 100644 index 00000000..13fd27c9 --- /dev/null +++ b/coin/platform_configs/default.txt @@ -0,0 +1,26 @@ +Template Target OS Target arch Compiler Features +----------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- +qtci-windows-8-x86_64 MSVC2013 DeveloperBuild Release BuildExamples +qtci-windows-8-x86_64 MSVC2012 DeveloperBuild Release QtNamespace QtLibInfix +qtci-windows-8-x86 MSVC2013 Packaging DebugAndRelease Release OpenGLDynamic +qtci-windows-8-x86_64 MSVC2013 Packaging DebugAndRelease Release OpenGLDynamic +qtci-windows-7-x86 MSVC2010 Release DeveloperBuild QtNamespace QtLibInfix OpenGLDynamic +qtci-windows-7-x86 Mingw49 Packaging DebugAndRelease Release OpenGLDynamic +qtci-windows-10-x86 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic +qtci-windows-10-x86_64 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic +qtci-windows-8-x86_64 Windows_Phone_8_1 armv4 MSVC2013 Packaging DebugAndRelease Release DisableTests +qtci-windows-8-x86_64 WinRT_8_1 MSVC2013 Packaging DebugAndRelease Release DisableTests +qtci-linux-Ubuntu-14.04-x86_64 GCC NoWidgets ForceDebugInfo +qtci-linux-Ubuntu-14.04-x86_64 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace +qtci-linux-OpenSuSE-13.01-x86_64 GCC DeveloperBuild NoPch +qtci-linux-RHEL-6.6-x86_64 GCC Packaging Release NoUseGoldLinker +qtci-osx-10.11-x86_64 Clang Packaging DebugAndRelease Release +qtci-osx-10.10-x86_64 Clang DebugAndRelease Release +qtci-osx-10.9-x86_64 Clang DeveloperBuild Release QtNamespace NoPch +qtci-osx-10.8-x86_64 Clang Release NoFramework +qtci-osx-10.11-x86_64 IOS_ANY x86_64 Clang Release DisableTests Static +qtci-linux-RHEL-6.6-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-Ubuntu-14.04-x86_64 Boot2Qt_Fido armv7 GCC DisableTests +qtci-linux-RHEL-6.6-x86_64 QNX_660 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-Ubuntu-14.04-x86_64 GCC TestOnly LicenseCheck +qtci-windows-7-x86 Windows_7_Embedded armv4 MSVC2008 DeveloperBuild Release DisableTests OpenGLES2 diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt new file mode 100644 index 00000000..3b446382 --- /dev/null +++ b/coin/platform_configs/qt5.txt @@ -0,0 +1,17 @@ +Template Target OS Target arch Compiler Features +--------------------------- ------------------- ----------- ----------- ----------------------------------------------------------------------------------------------- +qtci-windows-8-x86_64 Windows_Phone_8_1 x86 MSVC2013 Packaging DebugAndRelease Release DisableTests +qtci-windows-10-x86_64 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release DisableTests +qtci-windows-10-x86_64 WinRT_10 MSVC2015 Packaging DebugAndRelease Release DisableTests +qtci-linux-RHEL-6.6-x86_64 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-windows-7-x86 Android_ANY armv7 Mingw49 Packaging Release DisableTests OpenGLES2 +qtci-windows-7-x86 Android_ANY x86 Mingw49 Packaging Release DisableTests OpenGLES2 +qtci-osx-10.11-x86_64 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2 +qtci-osx-10.11-x86_64 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 +qtci-linux-RHEL-6.6-x86_64 QNX_660 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-windows-7-x86 QNX_660 armv7 Mingw49 Packaging Release DisableTests OpenGLES2 +qtci-windows-7-x86 QNX_660 x86 Mingw49 Packaging Release DisableTests OpenGLES2 +# target arch is used here only for documentation the value is ignored +qtci-windows-10-x86_64 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release DisableTests + +qtci-osx-10.11-x86_64 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static From 7b17d411f17bd3309673a2855e1c08bd791bf897 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 11 Jan 2017 20:03:15 +0100 Subject: [PATCH 13/15] Update submodules on '5.8' in qt5 Change-Id: Id1cef4535c8f5ef2b7d366b73ca4335e2c58f2a3 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtmultimedia | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qt3d b/qt3d index a4ab9962..abbf2ca1 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit a4ab9962239c692b302f0d75cfdec96359a8d33e +Subproject commit abbf2ca1aa6f598a0c0c51a4319b911d58f169ab diff --git a/qtbase b/qtbase index 22138f59..8b64f933 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 22138f59075ccc5dce8ee0c96ffbb7b5454bb561 +Subproject commit 8b64f9336255fa17f1b8e5f337d0e79765512150 diff --git a/qtdeclarative b/qtdeclarative index 046d1a09..6746db54 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 046d1a092b7b1ce7cb615d5e5e080a1cf8e41e10 +Subproject commit 6746db54f2adb40b836ce41101462bc38604749f diff --git a/qtdoc b/qtdoc index 2e764d83..ff91e32d 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 2e764d83cffa156a3172cd698e7d121868729aa4 +Subproject commit ff91e32db83c9a2ddce6ed7254f850ddd7a1238c diff --git a/qtmultimedia b/qtmultimedia index 4902bfcb..23a74e81 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 4902bfcbd619e9383ecd2e1b364d4fb1903989db +Subproject commit 23a74e810bb2ec4cb950eaae9760889c1e8a5d54 From 1ba2e086373301bb13db084501c38cb2fcf9fd08 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 13 Jan 2017 20:02:19 +0100 Subject: [PATCH 14/15] Update submodules on '5.8' in qt5 Change-Id: Ibd6924df667113c2a1c9b3a3e8f9c8d29c52c85c Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtmultimedia | 2 +- qtquickcontrols2 | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- qtwebkit | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qt3d b/qt3d index abbf2ca1..fc6ffba4 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit abbf2ca1aa6f598a0c0c51a4319b911d58f169ab +Subproject commit fc6ffba424bf279cd5e37bec76a7d9589254aac7 diff --git a/qtbase b/qtbase index 8b64f933..635d0ae0 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 8b64f9336255fa17f1b8e5f337d0e79765512150 +Subproject commit 635d0ae00717b9ba53a8e007e50fac0d2721ca35 diff --git a/qtcharts b/qtcharts index 0a3e9460..a085dc02 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 0a3e9460c8a54061a6e858e6e65c4b5ea0a8a093 +Subproject commit a085dc02ea0c9712548ed6babcfce6410adc55d8 diff --git a/qtconnectivity b/qtconnectivity index 2df17b2a..8690dd6d 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 2df17b2a0c050df98bd87a3dff218096ec84b2fb +Subproject commit 8690dd6d59831206736b3a7839d8d3fd14251362 diff --git a/qtdeclarative b/qtdeclarative index 6746db54..0e3380f9 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 6746db54f2adb40b836ce41101462bc38604749f +Subproject commit 0e3380f9c6ab6e3ea7398caccf5aa84f1575f1cd diff --git a/qtdoc b/qtdoc index ff91e32d..846fe070 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit ff91e32db83c9a2ddce6ed7254f850ddd7a1238c +Subproject commit 846fe070661e97c31feff4d96c2be001740f3e5a diff --git a/qtmultimedia b/qtmultimedia index 23a74e81..c1164f87 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 23a74e810bb2ec4cb950eaae9760889c1e8a5d54 +Subproject commit c1164f874a21959d03893f62db8f8e2def44122d diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 00a06264..698cffce 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 00a062649b8aec20c3ac3f61aa72b1cdde43b055 +Subproject commit 698cffce2171bed322aa9d0df1fda316c379efda diff --git a/qttools b/qttools index 980fbea7..b7ccfd3c 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 980fbea7adb3d31b8017f844bc8856612d3f7cff +Subproject commit b7ccfd3c107e2edc3823cd79cf67d8e4e34f668b diff --git a/qttranslations b/qttranslations index f9774825..e6099ef4 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit f97748255437acc0548b9d803467162f39df7a27 +Subproject commit e6099ef43102cab50b2e97f6c9a90f7573793d18 diff --git a/qtwayland b/qtwayland index 5e6259b0..cab7cb98 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 5e6259b09326022324709c44ad533d004056e048 +Subproject commit cab7cb98d5b9530a3c265cc2436dd7d157e43f66 diff --git a/qtwebkit b/qtwebkit index a0c60c53..fce06b35 160000 --- a/qtwebkit +++ b/qtwebkit @@ -1 +1 @@ -Subproject commit a0c60c53c0fe1b1f6b5ab52944e031a3684e3de1 +Subproject commit fce06b359971d798474892fad2d56092f27b0f6b From b336c10c08bd7b053a49e06aaa725339d4fb4ea1 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Sun, 15 Jan 2017 20:02:11 +0100 Subject: [PATCH 15/15] Update submodules on '5.8' in qt5 Change-Id: I6c8442fbe66f30e1c822efa0ff83387c25e6ac8f Reviewed-by: Liang Qi --- qtbase | 2 +- qtcharts | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtquickcontrols2 | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qtbase b/qtbase index 635d0ae0..7600cb69 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 635d0ae00717b9ba53a8e007e50fac0d2721ca35 +Subproject commit 7600cb6901f515edf6dd712f594927c1b43d61a8 diff --git a/qtcharts b/qtcharts index a085dc02..b238436e 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit a085dc02ea0c9712548ed6babcfce6410adc55d8 +Subproject commit b238436e27ffa17a470ce2b69f3abe9a13cb14c1 diff --git a/qtdeclarative b/qtdeclarative index 0e3380f9..ec5f3fa6 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 0e3380f9c6ab6e3ea7398caccf5aa84f1575f1cd +Subproject commit ec5f3fa6b7ddf0ed80801f70add90444f3714593 diff --git a/qtdoc b/qtdoc index 846fe070..de7e0d94 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 846fe070661e97c31feff4d96c2be001740f3e5a +Subproject commit de7e0d947e21155580aa34c009aad2395b1358ff diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 698cffce..537eced6 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 698cffce2171bed322aa9d0df1fda316c379efda +Subproject commit 537eced61381f0ce1eabdc797bb0dacd11e11d39 diff --git a/qtwayland b/qtwayland index cab7cb98..52db6d23 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit cab7cb98d5b9530a3c265cc2436dd7d157e43f66 +Subproject commit 52db6d23381269f0806377574d08e36aa05fc31a diff --git a/qtwebengine b/qtwebengine index ceff67e0..51d5737f 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit ceff67e0bab4d34c5b791d1f1b1d43c7a4e44d84 +Subproject commit 51d5737fa45b62ff9fc769cdb8d3a238dbe9d1cb