From 9929aff99ec02ed57ad9693b22eb4a84ac1388c5 Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Tue, 28 May 2019 11:41:31 +0300 Subject: [PATCH 001/105] Add QMAKE_LFLAGS_APP+=-s as configure argument in linux desktop build After adding "-force-debug-info" and "-separate-debug-info" debug information is going in the binaries accidentally & so on exploding binary size. Debug symbols are wanted for libraries and adding QMAKE_LFLAGS_APP+=-s as configure argument will prevent debug information not to go inside binaries. Task-number: QTBUG-69767 Change-Id: Ieec205402b34870901aeb26d9ca98fa9edb159c6 Reviewed-by: Simon Hausmann --- coin/platform_configs/default.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 640196ad..e03cc56d 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -79,7 +79,7 @@ Template: 'qtci-linux-RHEL-7.4-x86_64' Compiler: 'GCC' Features: ['Packaging'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -separate-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-libudev -no-use-gold-linker -force-debug-info -separate-debug-info -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -qt-libjpeg -qt-libpng -qt-xcb -sysconfdir /etc/xdg -qt-pcre -qt-harfbuzz -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib QMAKE_LFLAGS_APP+=-s' - Template: 'qtci-macos-10.13-x86_64-2' Compiler: 'Clang' From fbec569aea2de9da30cb4b3820d35912797e9105 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 9 Aug 2019 07:59:37 +0000 Subject: [PATCH 002/105] Update submodules on '5.12' in qt5 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I363647bd417426f6f3629f42bbd1f6e83570c47e Reviewed-by: Tony Sarajärvi --- qtbase | 2 +- qtmultimedia | 2 +- qtvirtualkeyboard | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtbase b/qtbase index 36cc171b..6ce9404a 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 36cc171b9314bf77fc84d4273dceb6264aef7134 +Subproject commit 6ce9404a6e7ad6ba3ff37f6890fe400c643c3d52 diff --git a/qtmultimedia b/qtmultimedia index 636f46f0..70ad7699 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 636f46f04ba6d5c63783558ed78eb5f562179e9c +Subproject commit 70ad769934d9c82e1d1dd11e96386ce59db7631e diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index a826da7d..47d15b13 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit a826da7d9bee9bd96c84ceaba5f102f66fc538cd +Subproject commit 47d15b1378621041f612b395ded685fa4e6fbbd0 From 3b0fbe7213fae9b9e891511d3aecce5183b57e66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Joni=20J=C3=A4ntti?= Date: Tue, 4 Sep 2018 12:09:08 +0300 Subject: [PATCH 003/105] Provisioning: Ubuntu 18.04: Add required packages for b2qt MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit These packages are required for building b2qt module. Needed also on 5.12 branch as meta-qt5 follows Qt branching and will take provisionings from here. Change-Id: Ia6c5ffd95d4f778b23f381a6f1f5473aa11971e3 Reviewed-by: Samuli Piippo (cherry picked from commit ee9dd0d8601bbe252a6a99e44a3376016911f1b0) Reviewed-by: Tony Sarajärvi --- coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/02-apt.sh | 5 +++++ 1 file changed, 5 insertions(+) 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 d6c04d5b..c85c989d 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 @@ -159,6 +159,11 @@ installPackages+=(dkms) installPackages+=(libspeechd-dev) #Pypdf for PDF reading in RTA tests installPackages+=(python-pypdf2) +# Needed for b2qt +installPackages+=(git-lfs) +installPackages+=(chrpath) +installPackages+=(gawk) +installPackages+=(texinfo) echo "Running update for apt" waitLoop From b96719cb80078cad1f740b413edcee65f81116b5 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 12 Aug 2019 18:43:54 +0200 Subject: [PATCH 004/105] Update submodules on '5.12' in qt5 Change-Id: I465bd3b417d3412d7d8d62d868aa8ccb338127f2 Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qtmultimedia | 2 +- qtwayland | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtbase b/qtbase index 6ce9404a..7f4f346e 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 6ce9404a6e7ad6ba3ff37f6890fe400c643c3d52 +Subproject commit 7f4f346e51b0479a0ab0b927e586e6c626028b4b diff --git a/qtdeclarative b/qtdeclarative index 0647df8c..1adbf16f 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 0647df8c88d4eaeedd19456b6e382308208e2be1 +Subproject commit 1adbf16f2526b797a70bccf21b1400451f9d4cbb diff --git a/qtmultimedia b/qtmultimedia index 70ad7699..075fa620 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 70ad769934d9c82e1d1dd11e96386ce59db7631e +Subproject commit 075fa6203856bdf9f58e737ee2f5d2a843a85cad diff --git a/qtwayland b/qtwayland index 5ca9f28f..25a46893 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 5ca9f28f4b272d3265b97c16029071a0070195a6 +Subproject commit 25a46893782979c74f57ab725b1ce55fbfc4fa2f From 24f0367a60fdd3379014e507fa7f4553d433c601 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Wed, 27 Feb 2019 13:22:06 +0200 Subject: [PATCH 005/105] Add Suse Linux Enteprise Server 12 to the CI Task-number: QTQAINFRA-2851 Change-Id: Ia421a5e35f8a0515d7f761ca0c52a54a93dcee5c Reviewed-by: Heikki Halmet --- coin/platform_configs/default.yaml | 5 + .../common/linux/disable-notifications.sh | 4 +- .../01-systemsetup.sh | 69 +++++++++++++ .../02-disable-gnome-notifications.sh | 4 + .../02-disable-ntp.sh | 3 + .../02-zypperpackages.sh | 96 +++++++++++++++++++ .../qtci-linux-SLES-12-x86_64/08-libclang.sh | 7 ++ .../qtci-linux-SLES-12-x86_64/08-pythondev.sh | 59 ++++++++++++ .../qtci-linux-SLES-12-x86_64/09-cmake.sh | 5 + .../09-install-openssl.sh | 6 ++ .../qtci-linux-SLES-12-x86_64/18-icc.sh | 86 +++++++++++++++++ .../22-mqtt_broker.sh | 37 +++++++ .../qtci-linux-SLES-12-x86_64/55-emsdk.sh | 39 ++++++++ .../qtci-linux-SLES-12-x86_64/90-squish.sh | 4 + .../99-unset-proxy.sh | 39 ++++++++ .../qtci-linux-SLES-12-x86_64/99-version.sh | 48 ++++++++++ 16 files changed, 509 insertions(+), 2 deletions(-) create mode 100755 coin/provisioning/qtci-linux-SLES-12-x86_64/01-systemsetup.sh create mode 100755 coin/provisioning/qtci-linux-SLES-12-x86_64/02-disable-gnome-notifications.sh create mode 100755 coin/provisioning/qtci-linux-SLES-12-x86_64/02-disable-ntp.sh create mode 100755 coin/provisioning/qtci-linux-SLES-12-x86_64/02-zypperpackages.sh create mode 100755 coin/provisioning/qtci-linux-SLES-12-x86_64/08-libclang.sh create mode 100755 coin/provisioning/qtci-linux-SLES-12-x86_64/08-pythondev.sh create mode 100755 coin/provisioning/qtci-linux-SLES-12-x86_64/09-cmake.sh create mode 100755 coin/provisioning/qtci-linux-SLES-12-x86_64/09-install-openssl.sh create mode 100755 coin/provisioning/qtci-linux-SLES-12-x86_64/18-icc.sh create mode 100755 coin/provisioning/qtci-linux-SLES-12-x86_64/22-mqtt_broker.sh create mode 100755 coin/provisioning/qtci-linux-SLES-12-x86_64/55-emsdk.sh create mode 100755 coin/provisioning/qtci-linux-SLES-12-x86_64/90-squish.sh create mode 100755 coin/provisioning/qtci-linux-SLES-12-x86_64/99-unset-proxy.sh create mode 100755 coin/provisioning/qtci-linux-SLES-12-x86_64/99-version.sh diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index e03cc56d..5ed26734 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -75,6 +75,11 @@ Compiler: 'GCC' Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -release -static -nomake tests -nomake examples -no-sql-mysql -no-pch -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -no-feature-thread -xplatform wasm-emscripten' +- + Template: 'qtci-linux-SLES-12-x86_64' + Compiler: 'GCC' + Features: ['DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-sql-mysql -no-pch -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' - Template: 'qtci-linux-RHEL-7.4-x86_64' Compiler: 'GCC' diff --git a/coin/provisioning/common/linux/disable-notifications.sh b/coin/provisioning/common/linux/disable-notifications.sh index 7e805833..28d21656 100755 --- a/coin/provisioning/common/linux/disable-notifications.sh +++ b/coin/provisioning/common/linux/disable-notifications.sh @@ -1,4 +1,4 @@ #!/usr/bin/env bash -sudo gsettings set org.gnome.desktop.notifications.application:/update-manager/ enable false -sudo gsettings set org.gnome.desktop.notifications show-banners false +gsettings set org.gnome.desktop.notifications.application:/update-manager/ enable false +gsettings set org.gnome.desktop.notifications show-banners false diff --git a/coin/provisioning/qtci-linux-SLES-12-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-SLES-12-x86_64/01-systemsetup.sh new file mode 100755 index 00000000..0bf3ce24 --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-12-x86_64/01-systemsetup.sh @@ -0,0 +1,69 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2019 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 + +BASEDIR=$(dirname "$0") +# shellcheck source=../common/shared/network_test_server_ip.txt +source "$BASEDIR/../common/shared/network_test_server_ip.txt" +# shellcheck source=../common/unix/check_and_set_proxy.sh +source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" + +echo "Set timezone to UTC." +sudo timedatectl set-timezone Etc/UTC +echo "Timeout for blanking the screen (0 = never)" +gsettings set org.gnome.desktop.session idle-delay 0 +echo "Prevents screen lock when screesaver goes active." +gsettings set org.gnome.desktop.screensaver lock-enabled false +gsettings set org.gnome.desktop.lockdown disable-lock-screen 'true' + +sudo sed -i 's|GRUB_TIMEOUT=8|GRUB_TIMEOUT=0|g' /etc/default/grub +sudo grub2-mkconfig -o /boot/grub2/grub.cfg + +echo "Set Network Test Server address to $network_test_server_ip in /etc/hosts" +echo "$network_test_server_ip qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts +echo "Set DISPLAY" +echo 'export DISPLAY=":0"' >> ~/.bashrc + +while sudo fuser /usr/lib/packagekitd >/dev/null 2>&1 ; do + echo "Waiting for PackageKit to finish..." + sleep 0.5 +done + +# shellcheck disable=SC2031 +if [ "$http_proxy" != "" ]; then + sudo sed -i 's/PROXY_ENABLED=\"no\"/PROXY_ENABLED=\"yes\"/' /etc/sysconfig/proxy + sudo sed -i "s|HTTP_PROXY=\".*\"|HTTP_PROXY=\"$proxy\"|" /etc/sysconfig/proxy +fi diff --git a/coin/provisioning/qtci-linux-SLES-12-x86_64/02-disable-gnome-notifications.sh b/coin/provisioning/qtci-linux-SLES-12-x86_64/02-disable-gnome-notifications.sh new file mode 100755 index 00000000..f38c9bab --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-12-x86_64/02-disable-gnome-notifications.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +# shellcheck source=../common/linux/disable-notifications.sh +source "${BASH_SOURCE%/*}/../common/linux/disable-notifications.sh" diff --git a/coin/provisioning/qtci-linux-SLES-12-x86_64/02-disable-ntp.sh b/coin/provisioning/qtci-linux-SLES-12-x86_64/02-disable-ntp.sh new file mode 100755 index 00000000..38707a8a --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-12-x86_64/02-disable-ntp.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash +# shellcheck source=../common/linux/disable-ntp_linux.sh +source "${BASH_SOURCE%/*}/../common/linux/disable-ntp_linux.sh" diff --git a/coin/provisioning/qtci-linux-SLES-12-x86_64/02-zypperpackages.sh b/coin/provisioning/qtci-linux-SLES-12-x86_64/02-zypperpackages.sh new file mode 100755 index 00000000..cdea163f --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-12-x86_64/02-zypperpackages.sh @@ -0,0 +1,96 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2019 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 + +sudo zypper -nq install git gcc gcc-c++ + +sudo zypper -nq install bison flex gperf \ + zlib-devel \ + libudev-devel \ + glib2-devel \ + libopenssl-devel \ + freetype2-devel \ + fontconfig-devel \ + sqlite3-devel \ + libxkbcommon-devel \ + libxkbcommon-x11-devel + +sudo zypper -nq install p7zip + +# EGL support +sudo zypper -nq install Mesa-libEGL-devel Mesa-libGL-devel + +# gtk3 style for QtGui/QStyle +sudo zypper -nq install gtk3-devel + +# Xinput2 +sudo zypper -nq install libXi-devel postgresql10 postgresql10-devel mysql-devel mysql mysql-server + +# system provided XCB libraries +sudo zypper -nq install xcb-util-devel xcb-util-image-devel xcb-util-keysyms-devel \ + xcb-util-wm-devel xcb-util-renderutil-devel + +# ICU +sudo zypper -nq install libicu-devel libicu52_1 + +# qtwebengine +sudo zypper -nq install alsa-devel dbus-1-devel \ + libXcomposite-devel libXcursor-devel libXrandr-devel libXtst-devel \ + mozilla-nspr-devel mozilla-nss-devel + +# qtwebkit +sudo zypper -nq install libxml2-devel libxslt-devel + +# GStreamer (qtwebkit and qtmultimedia), pulseaudio (qtmultimedia) +sudo zypper -nq install gstreamer-devel gstreamer-plugins-base-devel libpulse-devel + +# cups +sudo zypper -nq install cups-devel + +# speech-dispatcher +sudo zypper -nq install libspeechd-devel +# https://bugzilla.suse.com/show_bug.cgi?id=1129586 +sudo mv /usr/include/speech-dispatcher/speech-dispatcher/* /usr/include/speech-dispatcher/ + +# ODBC support +sudo zypper -nq install unixODBC-devel unixODBC + +# freetds support +sudo zypper -nq install libfreetds freetds-devel + +# sqlite2 support +sudo zypper -nq install sqlite2 sqlite2-devel + diff --git a/coin/provisioning/qtci-linux-SLES-12-x86_64/08-libclang.sh b/coin/provisioning/qtci-linux-SLES-12-x86_64/08-libclang.sh new file mode 100755 index 00000000..bbe2b4b4 --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-12-x86_64/08-libclang.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +set -ex + +BASEDIR=$(dirname "$0") +# shellcheck source=../common/unix/libclang.sh +"$BASEDIR/../common/unix/libclang.sh" diff --git a/coin/provisioning/qtci-linux-SLES-12-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-SLES-12-x86_64/08-pythondev.sh new file mode 100755 index 00000000..cc9385e9 --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-12-x86_64/08-pythondev.sh @@ -0,0 +1,59 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2019 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$ +## +############################################################################# + +# provides: python development libraries +# version: provided by default Linux distribution repository +# needed to build pyside + +set -ex + +sudo zypper -nq install python-devel + +wget -q https://raw.githubusercontent.com/linux-on-ibm-z/scripts/master/Python3/build_python3.sh +sed -i 's/12.3/12.4/g' build_python3.sh +bash build_python3.sh + +export +python3 --version + +pip3 install --user wheel +pip3 install --user virtualenv + +# Install all needed packages in a special wheel cache directory +pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt" + +# shellcheck source=../common/unix/SetEnvVar.sh +source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" +SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels" diff --git a/coin/provisioning/qtci-linux-SLES-12-x86_64/09-cmake.sh b/coin/provisioning/qtci-linux-SLES-12-x86_64/09-cmake.sh new file mode 100755 index 00000000..5eb53566 --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-12-x86_64/09-cmake.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +set -ex + +"$(dirname "$0")/../common/linux/cmake_linux.sh" diff --git a/coin/provisioning/qtci-linux-SLES-12-x86_64/09-install-openssl.sh b/coin/provisioning/qtci-linux-SLES-12-x86_64/09-install-openssl.sh new file mode 100755 index 00000000..4f1d3768 --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-12-x86_64/09-install-openssl.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +set -ex + +# shellcheck source=../common/unix/install-openssl.sh +source "${BASH_SOURCE%/*}/../common/unix/install-openssl.sh" "linux" diff --git a/coin/provisioning/qtci-linux-SLES-12-x86_64/18-icc.sh b/coin/provisioning/qtci-linux-SLES-12-x86_64/18-icc.sh new file mode 100755 index 00000000..7ab8528a --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-12-x86_64/18-icc.sh @@ -0,0 +1,86 @@ +#!/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$ +## +############################################################################# + +# This script install Intel Parallel Studio XE Composer Edition for C++ Linux + +# shellcheck source=../common/unix/DownloadURL.sh +source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" + +set -ex + +mainStorage="ci-files01-hki.intra.qt.io:/hdd/www/input" +localMount="/mnt/storage/" + +iccPackage="parallel_studio_xe_2018_update1_composer_edition_for_cpp.tgz" +iccPackageSource="$localMount/intel/$iccPackage" +iccInstallPath="/opt/intel" +iccTmpPath="/tmp/icc" + +iccLicense="l_icc_2018.lic" +iccLicenseSource="$localMount/semisecure/$iccLicense" +iccLicenseTarget="/home/qt/$iccLicense" + +iccInstallInstructions="$iccTmpPath/instructions.txt" + +sudo mkdir -p "$localMount" +sudo mount "$mainStorage" "$localMount" +mkdir -p "$iccTmpPath" +tar -zxf "$iccPackageSource" -C "$iccTmpPath" --strip 1 + +cp "$iccLicenseSource" "$iccLicenseTarget" + +sudo umount "$localMount" + +cat >"$iccInstallInstructions" <>~/.bashrc +echo "export ICC64_18_PATH=$iccInstallPath/compilers_and_libraries_2018.1.163/linux/bin/intel64:$iccInstallPath/bin" >>~/.bashrc +echo "ICC = 18.0.1 20171018" >> ~/versions.txt + +rm -rf "$iccTmpPath" diff --git a/coin/provisioning/qtci-linux-SLES-12-x86_64/22-mqtt_broker.sh b/coin/provisioning/qtci-linux-SLES-12-x86_64/22-mqtt_broker.sh new file mode 100755 index 00000000..e677427f --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-12-x86_64/22-mqtt_broker.sh @@ -0,0 +1,37 @@ +#!/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$ +## +############################################################################# + +# shellcheck source=../common/unix/mqtt_broker.sh +source "${BASH_SOURCE%/*}/../common/unix/mqtt_broker.sh" diff --git a/coin/provisioning/qtci-linux-SLES-12-x86_64/55-emsdk.sh b/coin/provisioning/qtci-linux-SLES-12-x86_64/55-emsdk.sh new file mode 100755 index 00000000..09a76778 --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-12-x86_64/55-emsdk.sh @@ -0,0 +1,39 @@ +#!/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 + +# shellcheck source=../common/linux/emsdk.sh +source "${BASH_SOURCE%/*}/../common/linux/emsdk.sh" diff --git a/coin/provisioning/qtci-linux-SLES-12-x86_64/90-squish.sh b/coin/provisioning/qtci-linux-SLES-12-x86_64/90-squish.sh new file mode 100755 index 00000000..e4281588 --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-12-x86_64/90-squish.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/unix/squishInstall.sh" + diff --git a/coin/provisioning/qtci-linux-SLES-12-x86_64/99-unset-proxy.sh b/coin/provisioning/qtci-linux-SLES-12-x86_64/99-unset-proxy.sh new file mode 100755 index 00000000..5ff78055 --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-12-x86_64/99-unset-proxy.sh @@ -0,0 +1,39 @@ +#!/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 + +# Having proxy set while running autotests makes them fail +sudo sed -i 's/PROXY_ENABLED=\"yes\"/PROXY_ENABLED=\"no\"/' /etc/sysconfig/proxy + diff --git a/coin/provisioning/qtci-linux-SLES-12-x86_64/99-version.sh b/coin/provisioning/qtci-linux-SLES-12-x86_64/99-version.sh new file mode 100755 index 00000000..03565da2 --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-12-x86_64/99-version.sh @@ -0,0 +1,48 @@ +#!/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 needs to be called last during provisioning so that the software information will show up last in provision log. + +# Storage installed RPM packages information + +set -ex + +# shellcheck disable=SC2129 +echo "*********************************************" >> ~/versions.txt +echo "***** All installed RPM packages *****" >> ~/versions.txt +rpm -q -a | sort >> ~/versions.txt +echo "*********************************************" >> ~/versions.txt + +"$(dirname "$0")/../common/linux/version.sh" From 4175af18f8a56c8e9a372c28a8d800488f9f8a18 Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Mon, 12 Aug 2019 12:43:57 +0300 Subject: [PATCH 006/105] Add Android x86_64 architecture It seems those build targets were accidentally deleted when yaml change was merged in. Targets were there in Qt 5.13.0 release (before yaml change) This amends a94696ccd5be936099809eda58db02999cb7c77a. See also ebcfcbe69a5d34949d938211c364e1ff6f185b39. Task-number: QTBUG-47672 Change-Id: If2c22a8b995fdaa967f81062d0fae6dc725829dd Reviewed-by: Liang Qi Reviewed-by: BogDan Vatra --- coin/platform_configs/qt5.yaml | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/coin/platform_configs/qt5.yaml b/coin/platform_configs/qt5.yaml index 69f1c7e3..87b2c4c1 100644 --- a/coin/platform_configs/qt5.yaml +++ b/coin/platform_configs/qt5.yaml @@ -42,6 +42,14 @@ Target compiler: 'Clang' Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-use-gold-linker -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch x86' +- + Template: 'qtci-linux-RHEL-7.6-x86_64' + Target os: 'Android_ANY' + Target arch: 'x86_64' + Compiler: 'GCC' + Target compiler: 'Clang' + Features: ['Packaging', 'DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-use-gold-linker -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch x86_64' - Template: 'qtci-windows-10-x86_64-14' Target os: 'Android_ANY' @@ -66,6 +74,14 @@ Target compiler: 'Clang' Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -android-arch x86' +- + Template: 'qtci-windows-10-x86_64-14' + Target os: 'Android_ANY' + Target arch: 'x86_64' + Compiler: 'Mingw73' + Target compiler: 'Clang' + Features: ['Packaging', 'DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -android-arch x86_64' - Template: 'qtci-macos-10.13-x86_64-2' Target os: 'Android_ANY' @@ -90,6 +106,14 @@ Target compiler: 'Clang' Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host darwin-x86_64 -android-arch x86' +- + Template: 'qtci-macos-10.13-x86_64-2' + Target os: 'Android_ANY' + Target arch: 'x86_64' + Compiler: 'Clang' + Target compiler: 'Clang' + Features: ['Packaging', 'DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host darwin-x86_64 -android-arch x86_64' - Template: 'qtci-macos-10.13-x86_64-2' Target os: 'QNX_700' From 8e32f46764ec8b06ac1ce4cc4e3a70580328ce23 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Tue, 19 Mar 2019 12:02:57 +0200 Subject: [PATCH 007/105] Add Suse Linux Enteprise Server 15 to the CI Task-number: QTQAINFRA-3123 Change-Id: I725c58c7d319945f7470118dec99b5360385da7b Reviewed-by: Heikki Halmet --- coin/platform_configs/default.yaml | 5 + .../common/linux/disable-ntp_linux.sh | 2 + .../01-systemsetup.sh | 71 ++++++++++++++ .../02-disable-gnome-notifications.sh | 4 + .../02-disable-ntp.sh | 3 + .../02-zypperpackages.sh | 94 +++++++++++++++++++ .../qtci-linux-SLES-15-x86_64/08-libclang.sh | 7 ++ .../qtci-linux-SLES-15-x86_64/08-pythondev.sh | 58 ++++++++++++ .../09-install-openssl.sh | 6 ++ .../qtci-linux-SLES-15-x86_64/18-icc.sh | 86 +++++++++++++++++ .../22-mqtt_broker.sh | 37 ++++++++ .../qtci-linux-SLES-15-x86_64/55-emsdk.sh | 39 ++++++++ .../qtci-linux-SLES-15-x86_64/90-squish.sh | 4 + .../99-unset-proxy.sh | 39 ++++++++ .../qtci-linux-SLES-15-x86_64/99-version.sh | 48 ++++++++++ 15 files changed, 503 insertions(+) create mode 100755 coin/provisioning/qtci-linux-SLES-15-x86_64/01-systemsetup.sh create mode 100755 coin/provisioning/qtci-linux-SLES-15-x86_64/02-disable-gnome-notifications.sh create mode 100755 coin/provisioning/qtci-linux-SLES-15-x86_64/02-disable-ntp.sh create mode 100755 coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh create mode 100755 coin/provisioning/qtci-linux-SLES-15-x86_64/08-libclang.sh create mode 100755 coin/provisioning/qtci-linux-SLES-15-x86_64/08-pythondev.sh create mode 100755 coin/provisioning/qtci-linux-SLES-15-x86_64/09-install-openssl.sh create mode 100755 coin/provisioning/qtci-linux-SLES-15-x86_64/18-icc.sh create mode 100755 coin/provisioning/qtci-linux-SLES-15-x86_64/22-mqtt_broker.sh create mode 100755 coin/provisioning/qtci-linux-SLES-15-x86_64/55-emsdk.sh create mode 100755 coin/provisioning/qtci-linux-SLES-15-x86_64/90-squish.sh create mode 100755 coin/provisioning/qtci-linux-SLES-15-x86_64/99-unset-proxy.sh create mode 100755 coin/provisioning/qtci-linux-SLES-15-x86_64/99-version.sh diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 5ed26734..cc1f7083 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -80,6 +80,11 @@ Compiler: 'GCC' Features: ['DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-sql-mysql -no-pch -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' +- + Template: 'qtci-linux-SLES-15-x86_64' + Compiler: 'GCC' + Features: ['DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -no-sql-mysql -no-pch -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' - Template: 'qtci-linux-RHEL-7.4-x86_64' Compiler: 'GCC' diff --git a/coin/provisioning/common/linux/disable-ntp_linux.sh b/coin/provisioning/common/linux/disable-ntp_linux.sh index b73e44a5..4ded6042 100755 --- a/coin/provisioning/common/linux/disable-ntp_linux.sh +++ b/coin/provisioning/common/linux/disable-ntp_linux.sh @@ -39,6 +39,8 @@ echo "Disable Network Time Protocol (NTP)" if uname -a |grep -q "Ubuntu"; then sudo timedatectl set-ntp false +elif cat /etc/os-release |grep "SUSE Linux Enterprise Server 15"; then + sudo timedatectl set-ntp false else (systemctl &>/dev/null && sudo systemctl disable ntpd) || sudo /sbin/chkconfig ntpd off fi diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/01-systemsetup.sh b/coin/provisioning/qtci-linux-SLES-15-x86_64/01-systemsetup.sh new file mode 100755 index 00000000..ee0b6894 --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-15-x86_64/01-systemsetup.sh @@ -0,0 +1,71 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2019 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 + +BASEDIR=$(dirname "$0") +# shellcheck source=../common/shared/network_test_server_ip.txt +source "$BASEDIR/../common/shared/network_test_server_ip.txt" +# shellcheck source=../common/unix/check_and_set_proxy.sh +source "${BASH_SOURCE%/*}/../common/unix/check_and_set_proxy.sh" + +echo "Set timezone to UTC." +sudo timedatectl set-timezone Etc/UTC +echo "Timeout for blanking the screen (0 = never)" +gsettings set org.gnome.desktop.session idle-delay 0 +echo "Prevents screen lock when screesaver goes active." +gsettings set org.gnome.desktop.screensaver lock-enabled false +gsettings set org.gnome.desktop.lockdown disable-lock-screen 'true' + +sudo sed -i 's|GRUB_TIMEOUT=8|GRUB_TIMEOUT=0|g' /etc/default/grub +sudo grub2-mkconfig -o /boot/grub2/grub.cfg + +echo "Set Network Test Server address to $network_test_server_ip in /etc/hosts" +echo "$network_test_server_ip qt-test-server qt-test-server.qt-test-net" | sudo tee -a /etc/hosts +echo "Set DISPLAY" +echo 'export DISPLAY=":0"' >> ~/.bashrc + +sudo systemctl stop packagekit +sudo systemctl disable packagekit +while sudo fuser /usr/lib/packagekitd >/dev/null 2>&1 ; do + echo "Waiting for PackageKit to finish..." + sleep 5 +done + +# shellcheck disable=SC2031 +if [ "$http_proxy" != "" ]; then + sudo sed -i 's/PROXY_ENABLED=\"no\"/PROXY_ENABLED=\"yes\"/' /etc/sysconfig/proxy + sudo sed -i "s|HTTP_PROXY=\".*\"|HTTP_PROXY=\"$proxy\"|" /etc/sysconfig/proxy +fi diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/02-disable-gnome-notifications.sh b/coin/provisioning/qtci-linux-SLES-15-x86_64/02-disable-gnome-notifications.sh new file mode 100755 index 00000000..f38c9bab --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-15-x86_64/02-disable-gnome-notifications.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash + +# shellcheck source=../common/linux/disable-notifications.sh +source "${BASH_SOURCE%/*}/../common/linux/disable-notifications.sh" diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/02-disable-ntp.sh b/coin/provisioning/qtci-linux-SLES-15-x86_64/02-disable-ntp.sh new file mode 100755 index 00000000..38707a8a --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-15-x86_64/02-disable-ntp.sh @@ -0,0 +1,3 @@ +#!/usr/bin/env bash +# shellcheck source=../common/linux/disable-ntp_linux.sh +source "${BASH_SOURCE%/*}/../common/linux/disable-ntp_linux.sh" diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh b/coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh new file mode 100755 index 00000000..080bc43b --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-15-x86_64/02-zypperpackages.sh @@ -0,0 +1,94 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2019 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 + +sudo zypper -nq install git gcc gcc-c++ + +sudo zypper -nq install bison flex gperf \ + zlib-devel \ + libudev-devel \ + glib2-devel \ + libopenssl-devel \ + freetype2-devel \ + fontconfig-devel \ + sqlite3-devel \ + libxkbcommon-devel \ + libxkbcommon-x11-devel + +sudo zypper -nq install cmake + +sudo zypper -nq install p7zip + +# EGL support +sudo zypper -nq install Mesa-libEGL-devel Mesa-libGL-devel + +# gtk3 style for QtGui/QStyle +sudo zypper -nq install gtk3-devel + +# Xinput2 +sudo zypper -nq install libXi-devel postgresql10 postgresql10-devel mysql-devel mysql mysql-server + +# system provided XCB libraries +sudo zypper -nq install xcb-util-devel xcb-util-image-devel xcb-util-keysyms-devel \ + xcb-util-wm-devel xcb-util-renderutil-devel + +# ICU +sudo zypper -nq install libicu-devel libicu60_2 + +# qtwebengine +sudo zypper -nq install alsa-devel dbus-1-devel \ + libXcomposite-devel libXcursor-devel libXrandr-devel libXtst-devel \ + mozilla-nspr-devel mozilla-nss-devel + +# qtwebkit +sudo zypper -nq install libxml2-devel libxslt-devel + +# GStreamer (qtwebkit and qtmultimedia), pulseaudio (qtmultimedia) +sudo zypper -nq install gstreamer-devel gstreamer-plugins-base-devel libpulse-devel + +# cups +sudo zypper -nq install cups-devel + +# speech-dispatcher +sudo zypper -nq install libspeechd-devel +#sudo sed -i 's:includedir=/usr/include:includedir=/usr/include/speech-dispatcher:' /usr/lib64/pkgconfig/speech-dispatcher.pc + +# ODBC support +sudo zypper -nq install unixODBC-devel unixODBC + +# sqlite support +sudo zypper -nq install sqlite3 sqlite3-devel + diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/08-libclang.sh b/coin/provisioning/qtci-linux-SLES-15-x86_64/08-libclang.sh new file mode 100755 index 00000000..bbe2b4b4 --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-15-x86_64/08-libclang.sh @@ -0,0 +1,7 @@ +#!/usr/bin/env bash + +set -ex + +BASEDIR=$(dirname "$0") +# shellcheck source=../common/unix/libclang.sh +"$BASEDIR/../common/unix/libclang.sh" diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/08-pythondev.sh b/coin/provisioning/qtci-linux-SLES-15-x86_64/08-pythondev.sh new file mode 100755 index 00000000..cda48de7 --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-15-x86_64/08-pythondev.sh @@ -0,0 +1,58 @@ +#!/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$ +## +############################################################################# + +# provides: python development libraries +# version: provided by default Linux distribution repository +# needed to build pyside + +set -ex + +sudo zypper -nq install python-devel + +wget -q https://raw.githubusercontent.com/linux-on-ibm-z/scripts/master/Python3/build_python3.sh +bash build_python3.sh + +export +python3 --version + +pip3 install --user wheel +pip3 install --user virtualenv + +# Install all needed packages in a special wheel cache directory +pip3 wheel --wheel-dir "$HOME/python3-wheels" -r "${BASH_SOURCE%/*}/../common/shared/requirements.txt" + +# shellcheck source=../common/unix/SetEnvVar.sh +source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" +SetEnvVar "PYTHON3_WHEEL_CACHE" "$HOME/python3-wheels" diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/09-install-openssl.sh b/coin/provisioning/qtci-linux-SLES-15-x86_64/09-install-openssl.sh new file mode 100755 index 00000000..4f1d3768 --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-15-x86_64/09-install-openssl.sh @@ -0,0 +1,6 @@ +#!/bin/bash + +set -ex + +# shellcheck source=../common/unix/install-openssl.sh +source "${BASH_SOURCE%/*}/../common/unix/install-openssl.sh" "linux" diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/18-icc.sh b/coin/provisioning/qtci-linux-SLES-15-x86_64/18-icc.sh new file mode 100755 index 00000000..7ab8528a --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-15-x86_64/18-icc.sh @@ -0,0 +1,86 @@ +#!/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$ +## +############################################################################# + +# This script install Intel Parallel Studio XE Composer Edition for C++ Linux + +# shellcheck source=../common/unix/DownloadURL.sh +source "${BASH_SOURCE%/*}/../common/unix/DownloadURL.sh" + +set -ex + +mainStorage="ci-files01-hki.intra.qt.io:/hdd/www/input" +localMount="/mnt/storage/" + +iccPackage="parallel_studio_xe_2018_update1_composer_edition_for_cpp.tgz" +iccPackageSource="$localMount/intel/$iccPackage" +iccInstallPath="/opt/intel" +iccTmpPath="/tmp/icc" + +iccLicense="l_icc_2018.lic" +iccLicenseSource="$localMount/semisecure/$iccLicense" +iccLicenseTarget="/home/qt/$iccLicense" + +iccInstallInstructions="$iccTmpPath/instructions.txt" + +sudo mkdir -p "$localMount" +sudo mount "$mainStorage" "$localMount" +mkdir -p "$iccTmpPath" +tar -zxf "$iccPackageSource" -C "$iccTmpPath" --strip 1 + +cp "$iccLicenseSource" "$iccLicenseTarget" + +sudo umount "$localMount" + +cat >"$iccInstallInstructions" <>~/.bashrc +echo "export ICC64_18_PATH=$iccInstallPath/compilers_and_libraries_2018.1.163/linux/bin/intel64:$iccInstallPath/bin" >>~/.bashrc +echo "ICC = 18.0.1 20171018" >> ~/versions.txt + +rm -rf "$iccTmpPath" diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/22-mqtt_broker.sh b/coin/provisioning/qtci-linux-SLES-15-x86_64/22-mqtt_broker.sh new file mode 100755 index 00000000..e677427f --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-15-x86_64/22-mqtt_broker.sh @@ -0,0 +1,37 @@ +#!/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$ +## +############################################################################# + +# shellcheck source=../common/unix/mqtt_broker.sh +source "${BASH_SOURCE%/*}/../common/unix/mqtt_broker.sh" diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/55-emsdk.sh b/coin/provisioning/qtci-linux-SLES-15-x86_64/55-emsdk.sh new file mode 100755 index 00000000..09a76778 --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-15-x86_64/55-emsdk.sh @@ -0,0 +1,39 @@ +#!/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 + +# shellcheck source=../common/linux/emsdk.sh +source "${BASH_SOURCE%/*}/../common/linux/emsdk.sh" diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/90-squish.sh b/coin/provisioning/qtci-linux-SLES-15-x86_64/90-squish.sh new file mode 100755 index 00000000..e4281588 --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-15-x86_64/90-squish.sh @@ -0,0 +1,4 @@ +#!/usr/bin/env bash +BASEDIR=$(dirname "$0") +"$BASEDIR/../common/unix/squishInstall.sh" + diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/99-unset-proxy.sh b/coin/provisioning/qtci-linux-SLES-15-x86_64/99-unset-proxy.sh new file mode 100755 index 00000000..5ff78055 --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-15-x86_64/99-unset-proxy.sh @@ -0,0 +1,39 @@ +#!/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 + +# Having proxy set while running autotests makes them fail +sudo sed -i 's/PROXY_ENABLED=\"yes\"/PROXY_ENABLED=\"no\"/' /etc/sysconfig/proxy + diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/99-version.sh b/coin/provisioning/qtci-linux-SLES-15-x86_64/99-version.sh new file mode 100755 index 00000000..03565da2 --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-15-x86_64/99-version.sh @@ -0,0 +1,48 @@ +#!/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 needs to be called last during provisioning so that the software information will show up last in provision log. + +# Storage installed RPM packages information + +set -ex + +# shellcheck disable=SC2129 +echo "*********************************************" >> ~/versions.txt +echo "***** All installed RPM packages *****" >> ~/versions.txt +rpm -q -a | sort >> ~/versions.txt +echo "*********************************************" >> ~/versions.txt + +"$(dirname "$0")/../common/linux/version.sh" From 8d90ddd5318f6e4dcea5ebb0864a8bde94489739 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 14 Aug 2019 09:30:42 +0200 Subject: [PATCH 008/105] Update submodules on '5.13.1' in qt5 Change-Id: I2324f8a205f5e7fcb4cfea9e7e845ef9f4f867e4 Reviewed-by: Liang Qi --- qtbase | 2 +- qtquickcontrols2 | 2 +- qtscxml | 2 +- qtwayland | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtbase b/qtbase index 4f116f00..3c7583fa 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 4f116f00fcd93decbf6fc01b61b0be7c293d3c39 +Subproject commit 3c7583fabfe327a9b1646310739845b22f94d001 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 7c2ec7dc..230d6f6a 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 7c2ec7dc49799fffb2ed48a3a5afe2d8561ce3ee +Subproject commit 230d6f6adc580c853cc05f484e5000703f3e42b0 diff --git a/qtscxml b/qtscxml index 1323d465..14b12a05 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 1323d465b4698296533cf6c73ea5ace65dd0ce94 +Subproject commit 14b12a05efa4bd20f29ede7b729bfd5e2703358a diff --git a/qtwayland b/qtwayland index f4636b93..2b1aad5f 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit f4636b934f90b2a07b09f1925a86440cf1944d08 +Subproject commit 2b1aad5f86fec13bb83043ed1b08f066dd914b3d From 63181db03e9419ed0dca894edcdc8a6911868667 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 2 Aug 2019 18:31:02 +0200 Subject: [PATCH 009/105] Enable a no-gui build on Ubuntu 18.04 for 5.13 Task-number: QTQAINFRA-2576 Change-Id: I4bc96802b5fe940408158734b01f7b9b01361235 Reviewed-by: Liang Qi --- coin/platform_configs/default.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index c24ef38e..6af8429f 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -50,6 +50,11 @@ Compiler: 'GCC' Features: ['OutOfSourceBuild', 'Documentation'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -R . -qtlibinfix TestInfix -qtnamespace TestNamespace -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' +- + Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Compiler: 'GCC' + Features: ['DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -no-gui -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib' - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Compiler: 'GCC' From 3277628d6282f5ecffe6fdae7fd27261de11f551 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 14 Aug 2019 23:01:03 +0200 Subject: [PATCH 010/105] Update submodules on '5.13.1' in qt5 Change-Id: Ic89472db863aedd92db57dbaaf2dd5fd10efa96f Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdoc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtbase b/qtbase index 3c7583fa..2a4cf923 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 3c7583fabfe327a9b1646310739845b22f94d001 +Subproject commit 2a4cf923f4022760f9ed0f5dc50f8b849433b3f9 diff --git a/qtdoc b/qtdoc index 03ba767b..54b8ef3d 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 03ba767b36789489f46cce1ca19219dd409fbb74 +Subproject commit 54b8ef3dfd6a509007a2c92cade0cedf99756217 From 53c6c8a1ba7917f49de686acdd6d4df081aa6fd5 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 14 Aug 2019 22:30:51 +0200 Subject: [PATCH 011/105] Update submodules on '5.12' in qt5 Change-Id: Id2425a28299ca3653bc7d217855c276493bbccfe Reviewed-by: Liang Qi --- qtbase | 2 +- qtmultimedia | 2 +- qtwayland | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtbase b/qtbase index 7f4f346e..0d024bd0 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 7f4f346e51b0479a0ab0b927e586e6c626028b4b +Subproject commit 0d024bd0a63fa7a741f4f118a3b48806b695594f diff --git a/qtmultimedia b/qtmultimedia index 075fa620..9fba45e9 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 075fa6203856bdf9f58e737ee2f5d2a843a85cad +Subproject commit 9fba45e999f7c65f3cecf8fc914befd3d8b6db80 diff --git a/qtwayland b/qtwayland index 25a46893..43d8a309 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 25a46893782979c74f57ab725b1ce55fbfc4fa2f +Subproject commit 43d8a3091894ceb4ab934167b2f3eda27564eb6d From 9d69ef09e34c554633d6e4a6d97761bebd5f61a9 Mon Sep 17 00:00:00 2001 From: Tuomas Heimonen Date: Wed, 5 Jun 2019 14:44:09 +0300 Subject: [PATCH 012/105] Add Packaging to Saferenderer static builds Task-number: QSR-432 Change-Id: I6e1c52a52dd5a6b92eceb13aa8f650bcce0e1fa3 Reviewed-by: Iikka Eklund --- coin/platform_configs/qtsaferenderer.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index c2bc05e0..031d31ff 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -5,9 +5,10 @@ - Template: 'qtci-windows-10-x86_64-10' Compiler: 'Mingw73' + Features: ['Packaging'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -static -nomake tests -nomake examples -no-icu -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -platform win32-g++' - Template: 'qtci-linux-RHEL-7.4-x86_64' Compiler: 'GCC' - Features: ['DisableTests'] + Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -developer-build -static -nomake tests -nomake examples -no-use-gold-linker' From b03790e34dd11bdcf7270b064a4e3711067e3c4d Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 16 Aug 2019 23:01:07 +0200 Subject: [PATCH 013/105] Update submodules on '5.13.1' in qt5 Change-Id: I6c95fa658c52571ce1e0588eac1b9763f0bae549 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtqa | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtbase b/qtbase index 2a4cf923..a9b9a881 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 2a4cf923f4022760f9ed0f5dc50f8b849433b3f9 +Subproject commit a9b9a881344239781e5894f2dd3d0af90ffbb4ba diff --git a/qtqa b/qtqa index 5e3b8ac7..68a9cf7c 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 5e3b8ac763dffdd5e0343b6183540b7b59651502 +Subproject commit 68a9cf7cf8169589bfd1e9539a8695e661d1b036 From 965653136183870854739a0b3d284719ac15d3cf Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 17 Aug 2019 23:30:59 +0200 Subject: [PATCH 014/105] Update submodules on '5.12' in qt5 Change-Id: I8de6a77d460db6497b76dac92be674fe9e790b7d Reviewed-by: Qt Submodule Update Bot --- qtandroidextras | 2 +- qtbase | 2 +- qtqa | 2 +- qttools | 2 +- qtwayland | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qtandroidextras b/qtandroidextras index a50f613a..9039930c 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit a50f613a37acf32886ab94c0be780c1f25493d52 +Subproject commit 9039930c44d94fd101c260ef3abde680fc369501 diff --git a/qtbase b/qtbase index 0d024bd0..257bd49c 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 0d024bd0a63fa7a741f4f118a3b48806b695594f +Subproject commit 257bd49c1f47ba5fca6930082fdcf108f9d24e3f diff --git a/qtqa b/qtqa index 5e3b8ac7..68a9cf7c 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 5e3b8ac763dffdd5e0343b6183540b7b59651502 +Subproject commit 68a9cf7cf8169589bfd1e9539a8695e661d1b036 diff --git a/qttools b/qttools index a690022b..40a7f2c6 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit a690022b7e56b2e36a95ef22b854af4c82c5fdc8 +Subproject commit 40a7f2c6469e1702e791c66414051fed385a7930 diff --git a/qtwayland b/qtwayland index 43d8a309..3e96fa1d 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 43d8a3091894ceb4ab934167b2f3eda27564eb6d +Subproject commit 3e96fa1df8d2bc0ec8ab66abae1f20439b786b40 From b959cb535901666ae0bf5307d6f60490721e7c94 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 18 Aug 2019 23:00:50 +0200 Subject: [PATCH 015/105] Update submodules on '5.13.1' in qt5 Change-Id: I4f319b0afe7e7369eb7db168f66ec57ed867c267 Reviewed-by: Qt Submodule Update Bot --- qtwebengine | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtwebengine b/qtwebengine index a6c32599..d0725820 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit a6c32599a14e1c4c61f7b9c4968f8d8635f5e29c +Subproject commit d0725820c3f55aea3789489a64c63cc0b79325ff From 7c691c4622931a28d499230f6e42df14e48875e9 Mon Sep 17 00:00:00 2001 From: Paul Wicking Date: Mon, 19 Aug 2019 09:43:00 +0200 Subject: [PATCH 016/105] Adjust submodule branches --- .gitmodules | 80 ++++++++++++++++++++++++++--------------------------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/.gitmodules b/.gitmodules index 7657f30f..89b9df51 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,60 +1,60 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.12 + branch = 5.12.5 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = 5.12 + branch = 5.12.5 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg path = qtdeclarative url = ../qtdeclarative.git - branch = 5.12 + branch = 5.12.5 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = 5.12 + branch = 5.12.5 status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = 5.12 + branch = 5.12.5 status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = 5.12 + branch = 5.12.5 status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt path = qttools url = ../qttools.git - branch = 5.12 + branch = 5.12.5 status = essential [submodule "qtxmlpatterns"] depends = qtbase recommends = qtdeclarative path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.12 + branch = 5.12.5 status = addon [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = 5.12 + branch = 5.12.5 status = essential priority = 30 [submodule "qtdoc"] @@ -62,7 +62,7 @@ recommends = qtmultimedia qtquickcontrols qtquickcontrols2 path = qtdoc url = ../qtdoc.git - branch = 5.12 + branch = 5.12.5 status = essential priority = 40 [submodule "qtrepotools"] @@ -83,14 +83,14 @@ recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport path = qtlocation url = ../qtlocation.git - branch = 5.12 + branch = 5.12.5 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = 5.12 + branch = 5.12.5 status = addon [submodule "qtsystems"] depends = qtbase @@ -123,185 +123,185 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = 5.12 + branch = 5.12.5 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = 5.12 + branch = 5.12.5 status = addon [submodule "qt3d"] depends = qtbase recommends = qtdeclarative qtimageformats qtgamepad path = qt3d url = ../qt3d.git - branch = 5.12 + branch = 5.12.5 status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = 5.12 + branch = 5.12.5 status = addon [submodule "qtgraphicaleffects"] depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.12 + branch = 5.12.5 status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.12 + branch = 5.12.5 status = addon [submodule "qtserialbus"] depends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 5.12 + branch = 5.12.5 status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = 5.12 + branch = 5.12.5 status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = 5.12 + branch = 5.12.5 status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = 5.12 + branch = 5.12.5 status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = 5.12 + branch = 5.12.5 status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = 5.12 + branch = 5.12.5 status = addon [submodule "qtwebsockets"] depends = qtbase recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = 5.12 + branch = 5.12.5 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = 5.12 + branch = 5.12.5 status = addon [submodule "qtwebengine"] depends = qtdeclarative recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools path = qtwebengine url = ../qtwebengine.git - branch = 5.12 + branch = 5.12.5 status = addon priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative path = qtcanvas3d url = ../qtcanvas3d.git - branch = 5.12 + branch = 5.12.5 status = addon [submodule "qtwebview"] depends = qtdeclarative recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = 5.12 + branch = 5.12.5 status = addon [submodule "qtquickcontrols2"] depends = qtgraphicaleffects recommends = qtimageformats path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = 5.12 + branch = 5.12.5 status = essential [submodule "qtpurchasing"] depends = qtbase recommends = qtdeclarative qtandroidextras path = qtpurchasing url = ../qtpurchasing.git - branch = 5.12 + branch = 5.12.5 status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = 5.12 + branch = 5.12.5 status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = 5.12 + branch = 5.12.5 status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = 5.12 + branch = 5.12.5 status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad.git - branch = 5.12 + branch = 5.12.5 status = addon [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml.git - branch = 5.12 + branch = 5.12.5 status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech url = ../qtspeech.git - branch = 5.12 + branch = 5.12.5 status = addon [submodule "qtnetworkauth"] depends = qtbase path = qtnetworkauth url = ../qtnetworkauth.git - branch = 5.12 + branch = 5.12.5 status = addon [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative path = qtremoteobjects url = ../qtremoteobjects.git - branch = 5.12 + branch = 5.12.5 status = addon [submodule "qtwebglplugin"] depends = qtbase qtwebsockets recommends = qtdeclarative path = qtwebglplugin url = ../qtwebglplugin.git - branch = 5.12 + branch = 5.12.5 status = addon From 61acd9e95d86c71833e41ab95aec226034024803 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Mon, 12 Aug 2019 16:09:31 +0300 Subject: [PATCH 017/105] Provisioning: Update iOS signing tools new apple id is required with notarization Task-number: QTBUG-77359 Change-Id: I2aafda37d40608296d598b1d9ade83a025bcac8d Reviewed-by: Iikka Eklund --- .../qtci-macos-10.13-x86_64/55-signtools.sh | 16 ++++++++-------- .../qtci-macos-10.14-x86_64/55-signtools.sh | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/55-signtools.sh b/coin/provisioning/qtci-macos-10.13-x86_64/55-signtools.sh index 0b8595a0..aa61f549 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/55-signtools.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/55-signtools.sh @@ -114,15 +114,15 @@ sha1Ios="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36" { Install "$cacheSigningTools/ios_password.txt" "$targetFolder/ios_password.txt" $sha1Ios; } 2> /dev/null { iosPassword=$(cat "$targetFolder/ios_password.txt"); } 2> /dev/null -iPhoneDeveloper="iosdevelopment_2019.p12" -shaIPhoneDeveloper="fbc89661c5295b4105f3890989a94c559ea4a61c" -Install "$cacheSigningTools/latest_ios_cert/$iPhoneDeveloper" "$targetFolder/$iPhoneDeveloper" $shaIPhoneDeveloper +iPhoneDeveloper="iosDevelopment2019CiTeam.p12" +shaIPhoneDeveloper="fa22abe1b1cc64af6585f7a61c4aba5e00220bdc" +Install "$cacheSigningTools/latest_ios_cert_2019/$iPhoneDeveloper" "$targetFolder/$iPhoneDeveloper" $shaIPhoneDeveloper echo "Importing $iPhoneDeveloper.." { security import $targetFolder/$iPhoneDeveloper -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign; } 2> /dev/null -iPhoneDistribution="iosdistribution_2019.p12" -shaIPhoneDistribution="f306102f9e18e2074a7b655a9b151ce69c95baac" -Install "$cacheSigningTools/latest_ios_cert/$iPhoneDistribution" "$targetFolder/$iPhoneDistribution" $shaIPhoneDistribution +iPhoneDistribution="iosDistribution2019CiTeam.p12" +shaIPhoneDistribution="6510119651c7aecb21d0a1dae329f2eae1e8f4e9" +Install "$cacheSigningTools/latest_ios_cert_2019/$iPhoneDistribution" "$targetFolder/$iPhoneDistribution" $shaIPhoneDistribution echo "Importing $iPhoneDistribution.." { security import "$targetFolder/$iPhoneDistribution" -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign; } 2> /dev/null @@ -130,8 +130,8 @@ echo "Importing $iPhoneDistribution.." echo "Creating directory $targetFolder/Library/MobileDevice/Provisioning Profiles.." mkdir "$targetFolder/Library/MobileDevice" mkdir "$targetFolder/Library/MobileDevice/Provisioning Profiles" -shaMobileprovision="88c67c95a6f59e6463a00da0b5021f581db624bf" -Install "$cacheSigningTools/latest_ios_cert/iOS_Dev08112017.mobileprovision" "$targetFolder/Library/MobileDevice/Provisioning Profiles/iOS_Dev08112017.mobileprovision" $shaMobileprovision +shaMobileprovision="477a7f3876c4333bd56a045df0d82fce795b1ebb" +Install "$cacheSigningTools/latest_ios_cert_2019/iOS_Dev_2019_citeam.mobileprovision" "$targetFolder/Library/MobileDevice/Provisioning Profiles/iOS_Dev08112017.mobileprovision" $shaMobileprovision # Removing password files rm -fr "$targetFolder/login_keychain_password.txt" diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/55-signtools.sh b/coin/provisioning/qtci-macos-10.14-x86_64/55-signtools.sh index 0b8595a0..aa61f549 100755 --- a/coin/provisioning/qtci-macos-10.14-x86_64/55-signtools.sh +++ b/coin/provisioning/qtci-macos-10.14-x86_64/55-signtools.sh @@ -114,15 +114,15 @@ sha1Ios="aae58d00d0a1b179a09f21cfc67f9d16fb95ff36" { Install "$cacheSigningTools/ios_password.txt" "$targetFolder/ios_password.txt" $sha1Ios; } 2> /dev/null { iosPassword=$(cat "$targetFolder/ios_password.txt"); } 2> /dev/null -iPhoneDeveloper="iosdevelopment_2019.p12" -shaIPhoneDeveloper="fbc89661c5295b4105f3890989a94c559ea4a61c" -Install "$cacheSigningTools/latest_ios_cert/$iPhoneDeveloper" "$targetFolder/$iPhoneDeveloper" $shaIPhoneDeveloper +iPhoneDeveloper="iosDevelopment2019CiTeam.p12" +shaIPhoneDeveloper="fa22abe1b1cc64af6585f7a61c4aba5e00220bdc" +Install "$cacheSigningTools/latest_ios_cert_2019/$iPhoneDeveloper" "$targetFolder/$iPhoneDeveloper" $shaIPhoneDeveloper echo "Importing $iPhoneDeveloper.." { security import $targetFolder/$iPhoneDeveloper -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign; } 2> /dev/null -iPhoneDistribution="iosdistribution_2019.p12" -shaIPhoneDistribution="f306102f9e18e2074a7b655a9b151ce69c95baac" -Install "$cacheSigningTools/latest_ios_cert/$iPhoneDistribution" "$targetFolder/$iPhoneDistribution" $shaIPhoneDistribution +iPhoneDistribution="iosDistribution2019CiTeam.p12" +shaIPhoneDistribution="6510119651c7aecb21d0a1dae329f2eae1e8f4e9" +Install "$cacheSigningTools/latest_ios_cert_2019/$iPhoneDistribution" "$targetFolder/$iPhoneDistribution" $shaIPhoneDistribution echo "Importing $iPhoneDistribution.." { security import "$targetFolder/$iPhoneDistribution" -k $loginKeychain* -P "$iosPassword" -T /usr/bin/codesign; } 2> /dev/null @@ -130,8 +130,8 @@ echo "Importing $iPhoneDistribution.." echo "Creating directory $targetFolder/Library/MobileDevice/Provisioning Profiles.." mkdir "$targetFolder/Library/MobileDevice" mkdir "$targetFolder/Library/MobileDevice/Provisioning Profiles" -shaMobileprovision="88c67c95a6f59e6463a00da0b5021f581db624bf" -Install "$cacheSigningTools/latest_ios_cert/iOS_Dev08112017.mobileprovision" "$targetFolder/Library/MobileDevice/Provisioning Profiles/iOS_Dev08112017.mobileprovision" $shaMobileprovision +shaMobileprovision="477a7f3876c4333bd56a045df0d82fce795b1ebb" +Install "$cacheSigningTools/latest_ios_cert_2019/iOS_Dev_2019_citeam.mobileprovision" "$targetFolder/Library/MobileDevice/Provisioning Profiles/iOS_Dev08112017.mobileprovision" $shaMobileprovision # Removing password files rm -fr "$targetFolder/login_keychain_password.txt" From 2e9314967c3d7b94d5c31afa20fea22403cd1468 Mon Sep 17 00:00:00 2001 From: Paul Wicking Date: Mon, 19 Aug 2019 15:11:54 +0200 Subject: [PATCH 018/105] Adjust submodule branches --- .gitmodules | 82 ++++++++++++++++++++++++++--------------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/.gitmodules b/.gitmodules index b3c46af7..f657b96c 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,60 +1,60 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = dev + branch = 5.14 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = dev + branch = 5.14 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg path = qtdeclarative url = ../qtdeclarative.git - branch = dev + branch = 5.14 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = dev + branch = 5.14 status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = dev + branch = 5.14 status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = dev + branch = 5.14 status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt path = qttools url = ../qttools.git - branch = dev + branch = 5.14 status = essential [submodule "qtxmlpatterns"] depends = qtbase recommends = qtdeclarative path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = dev + branch = 5.14 status = deprecated [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = dev + branch = 5.14 status = essential priority = 30 [submodule "qtdoc"] @@ -62,7 +62,7 @@ recommends = qtmultimedia qtquickcontrols qtquickcontrols2 path = qtdoc url = ../qtdoc.git - branch = dev + branch = 5.14 status = essential priority = 40 [submodule "qtrepotools"] @@ -83,14 +83,14 @@ recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport path = qtlocation url = ../qtlocation.git - branch = dev + branch = 5.14 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = dev + branch = 5.14 status = addon [submodule "qtsystems"] depends = qtbase @@ -123,99 +123,99 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = dev + branch = 5.14 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = dev + branch = 5.14 status = addon [submodule "qt3d"] depends = qtbase recommends = qtdeclarative qtimageformats qtgamepad path = qt3d url = ../qt3d.git - branch = dev + branch = 5.14 status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = dev + branch = 5.14 status = addon [submodule "qtgraphicaleffects"] depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = dev + branch = 5.14 status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = dev + branch = 5.14 status = addon [submodule "qtserialbus"] depends = qtbase recommends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = dev + branch = 5.14 status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = dev + branch = 5.14 status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = dev + branch = 5.14 status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = dev + branch = 5.14 status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = dev + branch = 5.14 status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = dev + branch = 5.14 status = addon [submodule "qtwebsockets"] depends = qtbase recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = dev + branch = 5.14 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = dev + branch = 5.14 status = addon [submodule "qtwebengine"] depends = qtdeclarative recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools path = qtwebengine url = ../qtwebengine.git - branch = dev + branch = 5.14 status = addon priority = 10 [submodule "qtcanvas3d"] @@ -229,92 +229,92 @@ recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = dev + branch = 5.14 status = addon [submodule "qtquickcontrols2"] depends = qtgraphicaleffects recommends = qtimageformats path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = dev + branch = 5.14 status = essential [submodule "qtpurchasing"] depends = qtbase recommends = qtdeclarative qtandroidextras path = qtpurchasing url = ../qtpurchasing.git - branch = dev + branch = 5.14 status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = dev + branch = 5.14 status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = dev + branch = 5.14 status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = dev + branch = 5.14 status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad.git - branch = dev + branch = 5.14 status = addon [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml.git - branch = dev + branch = 5.14 status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech url = ../qtspeech.git - branch = dev + branch = 5.14 status = addon [submodule "qtnetworkauth"] depends = qtbase path = qtnetworkauth url = ../qtnetworkauth.git - branch = dev + branch = 5.14 status = addon [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative path = qtremoteobjects url = ../qtremoteobjects.git - branch = dev + branch = 5.14 status = addon [submodule "qtwebglplugin"] depends = qtbase qtwebsockets recommends = qtdeclarative path = qtwebglplugin url = ../qtwebglplugin.git - branch = dev + branch = 5.14 status = addon [submodule "qtlottie"] depends = qtbase qtdeclarative path = qtlottie url = ../qtlottie.git - branch = dev + branch = 5.14 status = preview [submodule "qtquicktimeline"] depends = qtbase qtdeclarative path = qtquicktimeline url = ../qtquicktimeline - branch = dev + branch = 5.14 status = preview From acafe0ad49ad21652a464846c8e7b526e7058204 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 19 Aug 2019 13:46:05 +0000 Subject: [PATCH 019/105] Update submodules on '5.13.1' in qt5 Change-Id: I0f321007da9f236c069703125d5529a54ad27c9c Reviewed-by: Jani Heikkinen --- qtwebengine | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtwebengine b/qtwebengine index d0725820..e0004165 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit d0725820c3f55aea3789489a64c63cc0b79325ff +Subproject commit e00041659a938b72e52c575338655264dc97b0bb From 6e601907b9f92d0ca104c35d5f403654cbc93e81 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 19 Aug 2019 23:31:00 +0200 Subject: [PATCH 020/105] Update submodules on '5.12' in qt5 Change-Id: Icd7419b3717c164db5f978610a2e821b683d8b22 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtscxml | 2 +- qttools | 2 +- qtwayland | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtbase b/qtbase index 257bd49c..fc049052 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 257bd49c1f47ba5fca6930082fdcf108f9d24e3f +Subproject commit fc049052812bfa0b63af1f3c5fcadf1eb582e775 diff --git a/qtscxml b/qtscxml index db44c53e..9bba89da 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit db44c53e73479ee8ea98f911078b387735906f38 +Subproject commit 9bba89da77b73f016f22bc5d3f195d9c0212c7bc diff --git a/qttools b/qttools index 40a7f2c6..a8aa0849 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 40a7f2c6469e1702e791c66414051fed385a7930 +Subproject commit a8aa08498a7a16b40a4559034abb47e37d719ba4 diff --git a/qtwayland b/qtwayland index 3e96fa1d..37a03693 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 3e96fa1df8d2bc0ec8ab66abae1f20439b786b40 +Subproject commit 37a03693f22cba7a17a5e7bdc3c340e7646aa6ef From e27c7adda7862069735cb377ced43171703ee535 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 20 Aug 2019 17:51:19 +0000 Subject: [PATCH 021/105] Update submodules on '5.13.1' in qt5 Change-Id: I6a801fd43a71d5ba772e71dae4101a6edbbcac95 Reviewed-by: Jani Heikkinen --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index a9b9a881..7d0fff91 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit a9b9a881344239781e5894f2dd3d0af90ffbb4ba +Subproject commit 7d0fff91ddadd03ff900b6d9a046a92ce6bf5a63 From 8a5d86d88826cd4db6e3993d8fcb14db0bbab015 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Tue, 20 Aug 2019 09:49:21 +0300 Subject: [PATCH 022/105] Suppress QEMU syscall and ioctl debug messages MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Compile QEMU with "Unsupported syscall" and "Unsupported ioctl" messages suppressed, those can be shown by set/unset environment variable QEMU_SYSCALL_DEBUG. Task-number: QTQAINFRA-2808 Change-Id: If0b28c47f2599c4ebca9cae6a6d38f9a4fd00458 Reviewed-by: Tony Sarajärvi --- .../qtci-linux-Ubuntu-18.04-x86_64/03-qemu.sh | 37 +++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-qemu.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-qemu.sh index 4ca84072..9a4558e2 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-qemu.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-qemu.sh @@ -121,6 +121,43 @@ index 11a311f9db..94d8abc745 100644 2.17.1 EOT +patch -p1 < +Date: Tue, 20 Aug 2019 09:46:46 +0300 +Subject: [PATCH] Suppress unsupported syscall and ioctl debug messages + +Those messages were spamming the CI tests output, thus they can +only be shown by defining environment variable QEMU_SYSCALL_DEBUG=true + +diff --git a/linux-user/syscall.c b/linux-user/syscall.c +index 94d8abc745..e72cfb0cb5 100644 +--- a/linux-user/syscall.c ++++ b/linux-user/syscall.c +@@ -5479,7 +5479,8 @@ static abi_long do_ioctl(int fd, int cmd, abi_long arg) + ie = ioctl_entries; + for(;;) { + if (ie->target_cmd == 0) { +- gemu_log("Unsupported ioctl: cmd=0x%04lx\n", (long)cmd); ++ if (getenv("QEMU_SYSCALL_DEBUG")) ++ gemu_log("Unsupported ioctl: cmd=0x%04lx\n", (long)cmd); + return -TARGET_ENOSYS; + } + if (ie->target_cmd == cmd) +@@ -12172,7 +12173,8 @@ abi_long do_syscall(void *cpu_env, int num, abi_long arg1, + + default: + unimplemented: +- gemu_log("qemu: Unsupported syscall: %d\n", num); ++ if (getenv("QEMU_SYSCALL_DEBUG")) ++ gemu_log("qemu: Unsupported syscall: %d\n", num); + #if defined(TARGET_NR_setxattr) || defined(TARGET_NR_get_thread_area) || defined(TARGET_NR_getdomainname) || defined(TARGET_NR_set_robust_list) + unimplemented_nowarn: + #endif +-- +2.17.1 +EOT + ./configure --target-list=arm-linux-user,aarch64-linux-user --static --disable-werror make sudo make install From 54be78024d3a4b25b72d3fa3d560f0f16431ffd5 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 21 Aug 2019 23:30:43 +0200 Subject: [PATCH 023/105] Update submodules on '5.12' in qt5 Change-Id: I82c4484938c958901bbc961b76a4012e0e925b9c Reviewed-by: Qt Submodule Update Bot From 9b0ff125951b3449d258edfe151680eef70ea87b Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 21 Aug 2019 21:03:32 +0200 Subject: [PATCH 024/105] Update submodules on '5.13' in qt5 Change-Id: I3c4c289580c3a5200989e76502c43a9ef293afed Reviewed-by: Liang Qi --- qt3d | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtimageformats | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquickcontrols2 | 2 +- qtscxml | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qt3d b/qt3d index b669a0d1..e1772c0a 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit b669a0d133b027091117ecccd9e47aa8086ef4ff +Subproject commit e1772c0a015ffac562b64e2c958a09d0ca074cd1 diff --git a/qtandroidextras b/qtandroidextras index c158f8d5..53e99cbb 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit c158f8d5179957084fd7ec1c2f97086b45604f56 +Subproject commit 53e99cbb2f73efd6e4adc7b13400fdc7fc74f345 diff --git a/qtbase b/qtbase index b5677bc6..d5c684c3 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit b5677bc6da9c5e7517edc4902dc1fe7cf211685d +Subproject commit d5c684c3c3e34e71bf50bdf1bd90039598b58afc diff --git a/qtdeclarative b/qtdeclarative index ffda7180..9655f7fd 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit ffda7180f3c11c35699ba8aa1a16efc6ee962e02 +Subproject commit 9655f7fdc96d26de369578bb6620f525c6f919d7 diff --git a/qtimageformats b/qtimageformats index d72ff0cd..f8b773d1 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit d72ff0cd09eda68a0579dc57389ecc1ee4a3b7c8 +Subproject commit f8b773d1d4b2f153eb97578ba5e49fd43564f7fb diff --git a/qtmultimedia b/qtmultimedia index 7b1bb300..d4a3e85e 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 7b1bb300166aa19dc0f4c6838eb6d284af73236c +Subproject commit d4a3e85eb86d551bdbeae973ab59c1fcee09393e diff --git a/qtqa b/qtqa index 5e3b8ac7..68a9cf7c 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 5e3b8ac763dffdd5e0343b6183540b7b59651502 +Subproject commit 68a9cf7cf8169589bfd1e9539a8695e661d1b036 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 7c2ec7dc..63a4ecea 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 7c2ec7dc49799fffb2ed48a3a5afe2d8561ce3ee +Subproject commit 63a4ecea93e278eeaa5de23d774d4dee06d9c4fa diff --git a/qtscxml b/qtscxml index 1323d465..9790a020 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 1323d465b4698296533cf6c73ea5ace65dd0ce94 +Subproject commit 9790a020801b900cff362a7c1ab808471c97835d diff --git a/qttools b/qttools index 6690a845..6a5fb1ef 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 6690a8453989408401d8166f1ab3aa41cc2d4360 +Subproject commit 6a5fb1ef73fc7a917efe3670fcdfa7aa6e09df86 diff --git a/qtwayland b/qtwayland index ca9be5ca..fc9c4a04 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit ca9be5cab503d85831653d6c4bc9c59bd0f6ad57 +Subproject commit fc9c4a04d7359cb00a733c56cf85fc9737c9886d diff --git a/qtwebengine b/qtwebengine index b1bdb599..1c33a4a6 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit b1bdb599a397d3f8d068b8619d32061c20e13e7c +Subproject commit 1c33a4a6ae07106513a8105ebbc2d0c65363b333 From c9a0797a111843fa98caf207fa902788f8355119 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Thu, 22 Aug 2019 09:52:20 +0200 Subject: [PATCH 025/105] Update qtdatavis3d only Change-Id: Ic100c7bac6fd7155203e2c16a2f855423b52cc5e Reviewed-by: Liang Qi --- qtdatavis3d | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtdatavis3d b/qtdatavis3d index 3206729a..b0114f0d 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 3206729aa704d9c7cdfaa734f177334d5c11ae72 +Subproject commit b0114f0dcba2d1709aac47530febc51e5078593e From 0414df3e2e87b5eb783dbaf5ba7e0eb8501e4647 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tony=20Saraj=C3=A4rvi?= Date: Wed, 21 Aug 2019 07:45:17 +0000 Subject: [PATCH 026/105] Build MIPS64 with b2qt toolchain - again This configuration verifies big endian builds. The build was accidentally removed in merge a94696ccd5be936099809eda58db02999cb7c77a. See also 9b84c7135b9903d6f975ea082d7ae5958248a8fd. Task-number: QTQAINFRA-2492 Change-Id: I2616f918591758b4cfee244a0a5414a61322f7d3 Reviewed-by: Liang Qi Reviewed-by: Samuli Piippo --- coin/platform_configs/default.yaml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 6af8429f..b566f66a 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -144,6 +144,13 @@ Target arch: 'arm64' Compiler: 'GCC' Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib' +- + Template: 'qtci-linux-Ubuntu-18.04-x86_64' + Target os: 'QEMU' + Target arch: 'mips64' + Compiler: 'GCC' + Features: ['DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-mips64/sysroots/x86_64-pokysdk-linux/usr/bin/mips64-poky-linux/mips64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-mips64/sysroots/mips64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-mips64/sysroots/mips64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib' - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Compiler: 'GCC' From 98d9e2ebaa16e0d070c65e50158985fd3b9cb9be Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 23 Aug 2019 23:30:59 +0200 Subject: [PATCH 027/105] Update submodules on '5.12' in qt5 Change-Id: I0fafe70aa1dcb74cd6e06eb37dca1175a50c568e Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtgraphicaleffects | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtquickcontrols2 | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/qt3d b/qt3d index 6388eb98..29541954 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 6388eb98a12a639a263ef34553269fc36b582269 +Subproject commit 29541954dc1ab128295487f25067876d9967b2f9 diff --git a/qtbase b/qtbase index fc049052..96ff6e8e 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit fc049052812bfa0b63af1f3c5fcadf1eb582e775 +Subproject commit 96ff6e8ebe80215a0d35055c7382bb1cf58fc660 diff --git a/qtdeclarative b/qtdeclarative index 1adbf16f..4d080635 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 1adbf16f2526b797a70bccf21b1400451f9d4cbb +Subproject commit 4d080635872fbb77a2adfb736d3f108b62cc058a diff --git a/qtgraphicaleffects b/qtgraphicaleffects index f9664053..718d2ec5 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit f9664053132affe48a069235eb6561a32d38b2a7 +Subproject commit 718d2ec554185f91db8e57e6ece14c7cf1b4caef diff --git a/qtlocation b/qtlocation index 63cd689a..aa8bb4d6 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 63cd689a400ee57f7e898e81290366c266537982 +Subproject commit aa8bb4d64864e0c3cfb9374a367e783602b75eba diff --git a/qtmultimedia b/qtmultimedia index 9fba45e9..a409efbc 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 9fba45e999f7c65f3cecf8fc914befd3d8b6db80 +Subproject commit a409efbc5530ad1e8becb018e1ad3319b931b2f3 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index da06da57..62c45cdc 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit da06da57002b64cf4bcde0ca708b3275a5f919ae +Subproject commit 62c45cdcd48e436c7d81d668b4da36c30928f871 diff --git a/qtwayland b/qtwayland index 37a03693..f5a28afe 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 37a03693f22cba7a17a5e7bdc3c340e7646aa6ef +Subproject commit f5a28afe4c2cb82540c94616e7a9e3e72e0e8327 diff --git a/qtwebengine b/qtwebengine index a2c365cb..5c579b95 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit a2c365cb1f22431845380159c29048da76c2b2a9 +Subproject commit 5c579b95c81388c9b596b209380a1a061718f5c6 From 54e8d38972d05ecc4f37d6989e5ed070f523858a Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 26 Aug 2019 07:45:26 +0200 Subject: [PATCH 028/105] Update submodules on '5.12.5' in qt5 Change-Id: If4b169a8c53ffb6857cc43d6e1dd5f7d639db45f Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtcharts | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtscript | 2 +- qtscxml | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- 27 files changed, 27 insertions(+), 27 deletions(-) diff --git a/qt3d b/qt3d index 6388eb98..29541954 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 6388eb98a12a639a263ef34553269fc36b582269 +Subproject commit 29541954dc1ab128295487f25067876d9967b2f9 diff --git a/qtactiveqt b/qtactiveqt index 62a802cb..a6f9475d 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 62a802cbccc18330b010d7197a739d35ba9ae3c7 +Subproject commit a6f9475d48e62a47cf20be47f20500e20a0f0c26 diff --git a/qtbase b/qtbase index 257bd49c..304587e3 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 257bd49c1f47ba5fca6930082fdcf108f9d24e3f +Subproject commit 304587e3dbb46d23180075bf20cebf7bc342a313 diff --git a/qtcanvas3d b/qtcanvas3d index 73d5bba6..ae8749c1 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 73d5bba61d4a57dfce92da8c8c4dbda311af977b +Subproject commit ae8749c175b64222190cdebc6d0b2eceddc0bfc8 diff --git a/qtcharts b/qtcharts index 8b79dba3..dd65e383 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 8b79dba3fd204ca4161ec7e7293cb95d698ce9db +Subproject commit dd65e383b2f900b8e661b678c746cd71fdef697e diff --git a/qtdatavis3d b/qtdatavis3d index 54a0844f..3858190b 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 54a0844f5c9c8ec54fcd740b8b99b05fe4532818 +Subproject commit 3858190b2b2e71a7b63e9976da2b22f1c342e3b3 diff --git a/qtdeclarative b/qtdeclarative index 1adbf16f..38bac80a 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 1adbf16f2526b797a70bccf21b1400451f9d4cbb +Subproject commit 38bac80aea1c2bd58acb10000e9a3daa65bba503 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index f9664053..06116f29 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit f9664053132affe48a069235eb6561a32d38b2a7 +Subproject commit 06116f294697e052edc31ac35dc58f46bf493913 diff --git a/qtimageformats b/qtimageformats index 9100cc7a..53f8fd57 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 9100cc7ab04586890fb8f1924b0e06ad3efa7d3e +Subproject commit 53f8fd57b698b97aded363700306fe61c4b9ea17 diff --git a/qtlocation b/qtlocation index 63cd689a..1de7ca61 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 63cd689a400ee57f7e898e81290366c266537982 +Subproject commit 1de7ca6175bd3e4a542a038a089cfd73c9eaa27a diff --git a/qtmultimedia b/qtmultimedia index 9fba45e9..0b77a2d9 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 9fba45e999f7c65f3cecf8fc914befd3d8b6db80 +Subproject commit 0b77a2d9852d3aa8c8c21a68be8a1d6805197155 diff --git a/qtnetworkauth b/qtnetworkauth index ee681478..773a0dc6 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit ee681478c4b05ab6640c0318ed4fa25d62c6f356 +Subproject commit 773a0dc64c73c1584fd1ed8fe081a9d9b1b1e4d5 diff --git a/qtpurchasing b/qtpurchasing index 6df36beb..acdb9438 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 6df36bebdcb0a12069b0cabfed797ebc719b587d +Subproject commit acdb9438f7ae94b29bab9c261ec20e18ec80390d diff --git a/qtscript b/qtscript index efbc554c..1701681e 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit efbc554c260f15b5c6dc23759eff96c106997a55 +Subproject commit 1701681e4f8ee3b17ca39f563a24065ee43b3a52 diff --git a/qtscxml b/qtscxml index db44c53e..f416efc6 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit db44c53e73479ee8ea98f911078b387735906f38 +Subproject commit f416efc6e2ea2fff4357cd87f4458e009ac5d595 diff --git a/qtserialport b/qtserialport index 9509b6d3..b1413c11 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 9509b6d3ee02c3c4a0b98dc95bc9787a3c514a18 +Subproject commit b1413c11b999aadca302c1b12dd90a12b55a1f12 diff --git a/qtspeech b/qtspeech index 1c004cd1..2f96f61f 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 1c004cd1f5c746a00c818bb6621100e82c110de4 +Subproject commit 2f96f61fc0f3d7b7627a64a9fae839bcf9f2489e diff --git a/qtsvg b/qtsvg index 347de1dd..cd2d1245 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 347de1dd25366015e3fbbc39ccd1a16ecb18eb2e +Subproject commit cd2d1245b8237aba4f64d8336b39e2635665564f diff --git a/qttools b/qttools index 40a7f2c6..a8aa0849 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 40a7f2c6469e1702e791c66414051fed385a7930 +Subproject commit a8aa08498a7a16b40a4559034abb47e37d719ba4 diff --git a/qtwayland b/qtwayland index 3e96fa1d..2c9396b0 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 3e96fa1df8d2bc0ec8ab66abae1f20439b786b40 +Subproject commit 2c9396b063ca03b36e03fbdb85853a410787313d diff --git a/qtwebchannel b/qtwebchannel index 8a610433..8943eb70 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 8a610433fa26c2601d669b45e903566287923bec +Subproject commit 8943eb70b12603f5136e83d285c01b7d50dbb2cf diff --git a/qtwebengine b/qtwebengine index a2c365cb..5c579b95 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit a2c365cb1f22431845380159c29048da76c2b2a9 +Subproject commit 5c579b95c81388c9b596b209380a1a061718f5c6 diff --git a/qtwebglplugin b/qtwebglplugin index ae907e4c..3581cde2 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit ae907e4c0aa5ae78435138f86a7bd888ef0e1e9a +Subproject commit 3581cde283545b907671d0cc42eeda6cbdeccb66 diff --git a/qtwebsockets b/qtwebsockets index dcf08a4c..465c6c39 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit dcf08a4c702f90cc092629078de48a0ad0d68562 +Subproject commit 465c6c3914455e8ed20f938e5d4a35e6decb446c diff --git a/qtwebview b/qtwebview index de7e4c93..57f656a9 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit de7e4c93c0f17e4608abad31bf7cba06b8fc2e19 +Subproject commit 57f656a964aa9fdeb966d14eddc39f62a989b86b diff --git a/qtwinextras b/qtwinextras index 3fc1164e..1ff458e8 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 3fc1164ee5464a317ac4daccc4edca09e4cae630 +Subproject commit 1ff458e8709d4e7b9a1489f2b246fc54efc8de72 diff --git a/qtx11extras b/qtx11extras index 10cc8dec..35ae66f8 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 10cc8dece051ec715a0db5c48ebcecebfe9d6c63 +Subproject commit 35ae66f89959e1dd98648cc4033e153e1e5240b4 From 11d6401d9855e765c8d37ca323bacccdc1c97c24 Mon Sep 17 00:00:00 2001 From: Tuomas Heimonen Date: Thu, 22 Aug 2019 12:09:58 +0300 Subject: [PATCH 029/105] Update Saferenderer static builds DisableTests on qtci-windows-10-x86_64-10 Add flag '-qt-libpng' to qtci-linux-RHEL-7.4-x86_64 Task-number: QSR-432 Change-Id: I3efc7f84f6c2eed49602e491f20f5a4f47512524 Reviewed-by: Jukka Jokiniva --- coin/platform_configs/qtsaferenderer.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index 031d31ff..42325b6d 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -5,10 +5,10 @@ - Template: 'qtci-windows-10-x86_64-10' Compiler: 'Mingw73' - Features: ['Packaging'] + Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -static -nomake tests -nomake examples -no-icu -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -platform win32-g++' - Template: 'qtci-linux-RHEL-7.4-x86_64' Compiler: 'GCC' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -developer-build -static -nomake tests -nomake examples -no-use-gold-linker' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -developer-build -static -nomake tests -nomake examples -no-use-gold-linker -qt-libpng' From 90d59cb4c70b455656400fee74057d6793989339 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 26 Aug 2019 22:07:18 +0200 Subject: [PATCH 030/105] Update submodules on '5.12' in qt5 Change-Id: I7f044a3d3a1aed8d1f9b97a1e73871ea91e9719e Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qt3d b/qt3d index 29541954..855295c3 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 29541954dc1ab128295487f25067876d9967b2f9 +Subproject commit 855295c3748239ae65e874b579f5449e4ea6723f diff --git a/qtbase b/qtbase index 96ff6e8e..b3dc0c13 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 96ff6e8ebe80215a0d35055c7382bb1cf58fc660 +Subproject commit b3dc0c13e88f3bd859c96144a9d4280c675665bc diff --git a/qtdeclarative b/qtdeclarative index 4d080635..4b944cb6 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 4d080635872fbb77a2adfb736d3f108b62cc058a +Subproject commit 4b944cb61fb3ceee2f1b743823e4a83b686bafd6 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 62c45cdc..5189f2bc 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 62c45cdcd48e436c7d81d668b4da36c30928f871 +Subproject commit 5189f2bc470da7ff6ae83d0108dd4e6abf35e04e diff --git a/qtremoteobjects b/qtremoteobjects index 2bcda9d9..47c6aa50 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 2bcda9d9f45858ac196d9972162c870ac0a6f217 +Subproject commit 47c6aa50d0423b6ccc40abdc16556d60d4fa9342 From 163bd8006e32184ad77654dd36d3cba417c65028 Mon Sep 17 00:00:00 2001 From: Tuomas Heimonen Date: Tue, 27 Aug 2019 11:20:22 +0300 Subject: [PATCH 031/105] Update Saferenderer static builds qtci-windows-10-x86_64-10 static build: remove flag '-developer-build' qtci-linux-RHEL-7.4-x86_64 static build: add flags '-no-fontconfig' and '-qt-freetype', remove flag '-developer-build' Task-number: QSR-491 Change-Id: I886ffbe9900ee63cd35e845b591086397c572abc Reviewed-by: Samuli Piippo --- coin/platform_configs/qtsaferenderer.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index 42325b6d..f0d33f8a 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -6,9 +6,9 @@ Template: 'qtci-windows-10-x86_64-10' Compiler: 'Mingw73' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -static -nomake tests -nomake examples -no-icu -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -platform win32-g++' + Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -static -nomake tests -nomake examples -no-icu -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -platform win32-g++' - Template: 'qtci-linux-RHEL-7.4-x86_64' Compiler: 'GCC' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -developer-build -static -nomake tests -nomake examples -no-use-gold-linker -qt-libpng' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -static -nomake tests -nomake examples -no-use-gold-linker -no-fontconfig -qt-freetype -qt-libpng' From 097b013183e1090e6b28691136ac7d7b5bfc574e Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 28 Aug 2019 07:32:24 +0200 Subject: [PATCH 032/105] Update submodules on '5.13' in qt5 Change-Id: Ibdf69fb6840da0ddcbe5e8623c19d0ce1c34f844 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgraphicaleffects | 2 +- qtlocation | 2 +- qtlottie | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtserialport | 2 +- qttools | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/qt3d b/qt3d index e1772c0a..dcd99cbf 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit e1772c0a015ffac562b64e2c958a09d0ca074cd1 +Subproject commit dcd99cbfd756276194ab462df4b9e26b932097b6 diff --git a/qtbase b/qtbase index d5c684c3..eb8d4611 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit d5c684c3c3e34e71bf50bdf1bd90039598b58afc +Subproject commit eb8d46117124c3deee4fbf462bb7201778f50f2b diff --git a/qtdeclarative b/qtdeclarative index 9655f7fd..0ae01dec 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 9655f7fdc96d26de369578bb6620f525c6f919d7 +Subproject commit 0ae01dec7aa0ffbb59e6e947bfa2e73ae030346a diff --git a/qtdoc b/qtdoc index 6430e145..f27ce213 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 6430e145e2d905d11daf690d2021ba1379780bbe +Subproject commit f27ce2135df6287a834dc0669f5a932ed96e0d2a diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 3b3b3f85..60bf7dec 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 3b3b3f85ddd472bdae168f210e62dc2868997aae +Subproject commit 60bf7decc8e063c9fbe63816578f116bc4eebae4 diff --git a/qtlocation b/qtlocation index a13506d5..f8c1007e 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit a13506d54409a78ee13a84052b78050a2f686832 +Subproject commit f8c1007e513b7df017ae4da2831183f3a66b69fb diff --git a/qtlottie b/qtlottie index 86c7306e..b6b7fa35 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 86c7306ebc0d011a096f0554e0c206fe17bb577c +Subproject commit b6b7fa3596d1957237d327a37941c6eb3ff8d6b3 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 63a4ecea..95383bf8 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 63a4ecea93e278eeaa5de23d774d4dee06d9c4fa +Subproject commit 95383bf86c0a49fea8ec47d1400067ead53749a9 diff --git a/qtremoteobjects b/qtremoteobjects index eff13458..eb7e5a85 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit eff13458a10ab9c40a839f952dedbfce2e6df59a +Subproject commit eb7e5a85ceed419bc93066b32cb8db7012ee8662 diff --git a/qtserialport b/qtserialport index 335f1d02..50372ac8 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 335f1d02dc134bf11277c0573553c7c838cc6a9f +Subproject commit 50372ac8f941a06b30f41624d819c4e5513f6b62 diff --git a/qttools b/qttools index 6a5fb1ef..8d3c4050 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 6a5fb1ef73fc7a917efe3670fcdfa7aa6e09df86 +Subproject commit 8d3c4050b3787b3572da9f32d7ae41069706cc96 diff --git a/qtwebengine b/qtwebengine index 1c33a4a6..299993a4 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 1c33a4a6ae07106513a8105ebbc2d0c65363b333 +Subproject commit 299993a4f60325fc5e70deff7b7734cf6bb0ede5 diff --git a/qtwebsockets b/qtwebsockets index 0634c810..1deee2a4 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 0634c8104558dbb7acd314d52cf4b039c8c3689d +Subproject commit 1deee2a4965fd7dc8a44c6d769519c4cbb11da4f From 314d3efaf096a933bf550266d3c6cacc28af35eb Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 29 Aug 2019 12:14:07 +0200 Subject: [PATCH 033/105] Update submodules on '5.14' in qt5 Change-Id: I0f5fdbd9f369dc42dd4c97dad1cb933753220e58 Reviewed-by: Liang Qi --- qt3d | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qtquicktimeline | 2 +- qtremoteobjects | 2 +- qtscript | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtx11extras | 2 +- 27 files changed, 27 insertions(+), 27 deletions(-) diff --git a/qt3d b/qt3d index 87abbae2..00e12527 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 87abbae2f16bae53aff6b2e41658bafbef642a95 +Subproject commit 00e12527dbaacf700ff7a22177a96c5628709fae diff --git a/qtandroidextras b/qtandroidextras index 503ba3db..79052c5b 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 503ba3db8749b49ed2e4705fd353c897dae390a5 +Subproject commit 79052c5be918a18ca6d02bbf6118088ba3e333a1 diff --git a/qtbase b/qtbase index 50e496bd..c28b881c 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 50e496bd3ac71ccebc99c0a429b41fb0e7864ac2 +Subproject commit c28b881c98fadcd3415370fad2525b558f6b03e4 diff --git a/qtdatavis3d b/qtdatavis3d index 422856bb..7bd8bf6c 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 422856bb470e1380309c66a8ba4b40e06d1df830 +Subproject commit 7bd8bf6cf8cf6b1f00085c27fd03fbe93010c670 diff --git a/qtdeclarative b/qtdeclarative index d4e1f539..a16e802b 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit d4e1f5395c896dc5bda9a2e122e2ed0f45be6c18 +Subproject commit a16e802b3d11781a1509e61da43978893989d7a2 diff --git a/qtdoc b/qtdoc index c7a53256..f6ee83c9 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit c7a53256d262ba58e59ebc3863c21c7b6cd2f0c8 +Subproject commit f6ee83c936dd68f053effbda5157285ae2ecc717 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index c76eb211..cb8c2803 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit c76eb211ff12fc3a1588c3092dd76a41eb5551c7 +Subproject commit cb8c28031c60c708721ef8a875076f12a630e6b9 diff --git a/qtimageformats b/qtimageformats index 82a6d342..17b50307 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 82a6d3426215253e013dd3ddd6712488388bc926 +Subproject commit 17b503073d5aeb505c15ef94f5af10d76898b1cf diff --git a/qtlocation b/qtlocation index 3334c6f6..f613eb3a 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 3334c6f6d00255f6fd5690e4b9cb05416950fd4d +Subproject commit f613eb3a6031d6d4f3e5ee230fab3056314fa9a4 diff --git a/qtmultimedia b/qtmultimedia index 9178132f..dd56d0fd 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 9178132f75563cd0e907525f08736c1b4cec73b4 +Subproject commit dd56d0fd8b45566c491ef30624177919eee621b4 diff --git a/qtqa b/qtqa index 5e3b8ac7..68a9cf7c 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 5e3b8ac763dffdd5e0343b6183540b7b59651502 +Subproject commit 68a9cf7cf8169589bfd1e9539a8695e661d1b036 diff --git a/qtquick3d b/qtquick3d index 03dbcc5e..a949102d 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 03dbcc5eb3364886ee8ffc07b4438eaee3c188fe +Subproject commit a949102dd14d92532644cae8696d04bc8aa5a646 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 92c827a2..5b963125 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 92c827a2a4b7e56dcb6865fa35fba25b5d2eb87f +Subproject commit 5b9631256f5c4500114981061e9f12104f0c5d82 diff --git a/qtquicktimeline b/qtquicktimeline index 6e6d4927..15de8ac5 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 6e6d4927f4620e58bd6acf71a0c6f54513f47c5f +Subproject commit 15de8ac5c06a0afcd8676f976254b3aeeebac586 diff --git a/qtremoteobjects b/qtremoteobjects index d88c6a16..e7e372d6 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit d88c6a1690d1d725e4436537546b3d5681ee4a9f +Subproject commit e7e372d6e4eedb473986189cc18a0b8ba71ecc57 diff --git a/qtscript b/qtscript index 40b5d325..44a9b1ff 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 40b5d325b6105d4e520c76a079f530168b58efec +Subproject commit 44a9b1ffbbd6ea127a2e8ce22dd5d87ef7474faf diff --git a/qtscxml b/qtscxml index 279d63c4..8388555f 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 279d63c4f6632237e6a0d9c4be91b466876c260a +Subproject commit 8388555ffb1da9cd5e714dfba6545736e6e2b496 diff --git a/qtsensors b/qtsensors index 4dfa9553..f8f2c4a5 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 4dfa95538ff15f59880c93675676ce609b365d89 +Subproject commit f8f2c4a5d0640090fd50656b1b585c0c3a0936bb diff --git a/qtserialbus b/qtserialbus index 556c6b67..45f9593e 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 556c6b67315c25f7e4359ab19314f3485f10ecc6 +Subproject commit 45f9593eff1141e7a86cda4f3dd2380c237c9f54 diff --git a/qtserialport b/qtserialport index bc4196f9..78bfc0a9 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit bc4196f908a96522ecaab078141364b3e10d1788 +Subproject commit 78bfc0a93077dafb217f854782e14b65a5746949 diff --git a/qtsvg b/qtsvg index b80a1676..9d274388 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit b80a1676c9f5cc0b428f15ac09f6648a80aacb26 +Subproject commit 9d274388f620dfafe0bc8fe0855ce0c8e8ae7892 diff --git a/qttools b/qttools index eba0529d..b5e21475 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit eba0529d488536e83b1e32b1c1c6c1000790e329 +Subproject commit b5e21475344d575a7f07f9d6f3dd2a9d82cf4a50 diff --git a/qttranslations b/qttranslations index 66952c79..c3f688fb 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 66952c79bc648e1074936dddb7fa2cffc17b1777 +Subproject commit c3f688fbdfaf633d7e6dd198865d4dc6cdef04b8 diff --git a/qtwayland b/qtwayland index 52b65607..32f3f85b 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 52b6560708ebcfeeaebdf2b43f368c610aa905a4 +Subproject commit 32f3f85b3ba044d9eb35996eb8df84b9822b2fd7 diff --git a/qtwebengine b/qtwebengine index 23b24fb4..1bb41f14 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 23b24fb49a9115151ea086afd271fdf9bb36fda0 +Subproject commit 1bb41f149bf2d3ad63442ae6058a4446344123c9 diff --git a/qtwebsockets b/qtwebsockets index e108b1f0..187d767f 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit e108b1f06d18003d7a758b07bc3bea9922b2e116 +Subproject commit 187d767f10a4319db2f442dfed080bbcbaccaa27 diff --git a/qtx11extras b/qtx11extras index 15ffa33a..a0443bd7 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 15ffa33a162325d2d16437a057e79cd3b0e3d61c +Subproject commit a0443bd723601205c8cc4666dd89be5a32decf98 From 5752c0d4bc5927107d6aaadaf703f17f0a05406a Mon Sep 17 00:00:00 2001 From: Tuomas Heimonen Date: Thu, 29 Aug 2019 16:20:44 +0300 Subject: [PATCH 034/105] Saferenderer: Update qtci-linux-RHEL-7.4-x86_64 static build Add build flag '-no-icu' to remove dependency to icu libraries Task-number: QSR-499 Change-Id: I788de8dfdeb9845e9135e83a424468d2f5ca20d2 Reviewed-by: Jukka Jokiniva --- coin/platform_configs/qtsaferenderer.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index f0d33f8a..6c71e719 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -11,4 +11,4 @@ Template: 'qtci-linux-RHEL-7.4-x86_64' Compiler: 'GCC' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -static -nomake tests -nomake examples -no-use-gold-linker -no-fontconfig -qt-freetype -qt-libpng' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -static -nomake tests -nomake examples -no-use-gold-linker -no-icu -no-fontconfig -qt-freetype -qt-libpng' From 27bbc468482da4fc178acd325216110dcc92d62b Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 30 Aug 2019 08:07:59 +0200 Subject: [PATCH 035/105] Update submodules on '5.13' in qt5 Change-Id: I5c1cc1e7edced0c2b62643b40769d84ebdeb3611 Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtremoteobjects | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qtbase b/qtbase index eb8d4611..375f5650 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit eb8d46117124c3deee4fbf462bb7201778f50f2b +Subproject commit 375f56506089f98118aa1848ed9f05a35e212c90 diff --git a/qtdeclarative b/qtdeclarative index 0ae01dec..98f29914 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 0ae01dec7aa0ffbb59e6e947bfa2e73ae030346a +Subproject commit 98f29914e4e233358ef31068542fceeea92eda97 diff --git a/qtdoc b/qtdoc index f27ce213..afab7f53 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit f27ce2135df6287a834dc0669f5a932ed96e0d2a +Subproject commit afab7f53a969a40037aab50572d837481c9c32ce diff --git a/qtmultimedia b/qtmultimedia index d4a3e85e..03188b88 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit d4a3e85eb86d551bdbeae973ab59c1fcee09393e +Subproject commit 03188b88025a849e15125eecb21395fa7f9a0158 diff --git a/qtqa b/qtqa index 68a9cf7c..8a79bcdf 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 68a9cf7cf8169589bfd1e9539a8695e661d1b036 +Subproject commit 8a79bcdf467d9e1e16821fdb3aff9ee8e3c652dd diff --git a/qtremoteobjects b/qtremoteobjects index eb7e5a85..e2eeee25 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit eb7e5a85ceed419bc93066b32cb8db7012ee8662 +Subproject commit e2eeee25f8b76b1f7b1c9b69b2417c2f6a4553d6 diff --git a/qtwayland b/qtwayland index fc9c4a04..cd2c3a89 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit fc9c4a04d7359cb00a733c56cf85fc9737c9886d +Subproject commit cd2c3a8916a9cc7ab31f6e18e6f1510a048f4ace diff --git a/qtwebengine b/qtwebengine index 299993a4..81d103b4 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 299993a4f60325fc5e70deff7b7734cf6bb0ede5 +Subproject commit 81d103b44d620c4c170c7a80e06149b5011753fb From 4c65509d245a8fcdee5abec33b587d19312b3814 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 30 Aug 2019 14:17:14 +0200 Subject: [PATCH 036/105] Update submodules on '5.12' in qt5 Change-Id: I1c5b9f51ed5a4dcb4469aa90439da993bc133319 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qt3d b/qt3d index 855295c3..151694c0 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 855295c3748239ae65e874b579f5449e4ea6723f +Subproject commit 151694c095e05e1c735f96f60c799cc717e93dc1 diff --git a/qtbase b/qtbase index b3dc0c13..7b2dfb37 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit b3dc0c13e88f3bd859c96144a9d4280c675665bc +Subproject commit 7b2dfb37ee5a4252d83e7b08970107a15561fe61 diff --git a/qtdeclarative b/qtdeclarative index 4b944cb6..35acc9fc 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 4b944cb61fb3ceee2f1b743823e4a83b686bafd6 +Subproject commit 35acc9fc3c41446bacbbfe754f7f494de7f62411 diff --git a/qtdoc b/qtdoc index 8c6b3135..05ad406b 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 8c6b31353174e5f95cbc43c0ab51c8b0085b2663 +Subproject commit 05ad406b9d1673d96f187c3474d6f4de3cdc7240 diff --git a/qtmultimedia b/qtmultimedia index a409efbc..94852a47 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit a409efbc5530ad1e8becb018e1ad3319b931b2f3 +Subproject commit 94852a47c130c3dc265d900390bf0d7b53cbab3e diff --git a/qtqa b/qtqa index 68a9cf7c..8a79bcdf 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 68a9cf7cf8169589bfd1e9539a8695e661d1b036 +Subproject commit 8a79bcdf467d9e1e16821fdb3aff9ee8e3c652dd diff --git a/qtwayland b/qtwayland index f5a28afe..2e9c90aa 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit f5a28afe4c2cb82540c94616e7a9e3e72e0e8327 +Subproject commit 2e9c90aaefdfe5f1e9b90159c5e6981230627055 diff --git a/qtwebengine b/qtwebengine index 5c579b95..d5d0cd81 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 5c579b95c81388c9b596b209380a1a061718f5c6 +Subproject commit d5d0cd81cc770d696b19305717cc827ec1a89bd4 From 80791b03ee245b893e638a78508f1fa957f0b08d Mon Sep 17 00:00:00 2001 From: Jukka Jokiniva Date: Sun, 1 Sep 2019 15:43:42 +0300 Subject: [PATCH 037/105] Update qtbase submodule on 5.13.1 in qt5 Change-Id: Ia5d9429b6cfc0804355a2161a18f030db6fa6dae Reviewed-by: Jukka Jokiniva --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index 7d0fff91..af6ac444 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 7d0fff91ddadd03ff900b6d9a046a92ce6bf5a63 +Subproject commit af6ac444c97ed2dc234f93fe457440c9da5482ea From ae3f765798629dd3bd4183245c9d58231e118a5c Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 1 Sep 2019 15:55:54 +0200 Subject: [PATCH 038/105] Update submodules on '5.12.5' in qt5 Change-Id: I22bbce6e60cc835a5dc9f88737e04ecc7a1fc3e0 Reviewed-by: Liang Qi --- qtandroidextras | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtmacextras | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtvirtualkeyboard | 2 +- qtwebengine | 2 +- qtxmlpatterns | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/qtandroidextras b/qtandroidextras index 9039930c..72e0dcd0 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 9039930c44d94fd101c260ef3abde680fc369501 +Subproject commit 72e0dcd050ae9a38b9db80956dd1f0db15e93e59 diff --git a/qtbase b/qtbase index 304587e3..7b82d274 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 304587e3dbb46d23180075bf20cebf7bc342a313 +Subproject commit 7b82d27429cde931114776f1a26f4c3850c8bb72 diff --git a/qtconnectivity b/qtconnectivity index 406b18fd..0a5bf7a4 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 406b18fdb3704a9e9e66cefbc74e7cff55f1947c +Subproject commit 0a5bf7a41e5c2c4a36efeace83444ceaee79c945 diff --git a/qtdeclarative b/qtdeclarative index 38bac80a..7b473507 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 38bac80aea1c2bd58acb10000e9a3daa65bba503 +Subproject commit 7b47350736f46c59d81238d3d6284358a652983b diff --git a/qtdoc b/qtdoc index 8c6b3135..66db05b5 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 8c6b31353174e5f95cbc43c0ab51c8b0085b2663 +Subproject commit 66db05b51f337ea3a8c553a57cdbaabdb2aff375 diff --git a/qtgamepad b/qtgamepad index 656f3c13..09de115d 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 656f3c134c0cf00743deba3dfaaff7cb5bd17906 +Subproject commit 09de115d0d31fbc62d16aef821f96b487dbf5169 diff --git a/qtmacextras b/qtmacextras index 3247a8f3..bf2fe74a 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 3247a8f30ef1aa26fefc5d8b8f81f35567bf0071 +Subproject commit bf2fe74afe29fb5bb1b39943f7c5c8a106ae47ee diff --git a/qtqa b/qtqa index 68a9cf7c..8a79bcdf 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 68a9cf7cf8169589bfd1e9539a8695e661d1b036 +Subproject commit 8a79bcdf467d9e1e16821fdb3aff9ee8e3c652dd diff --git a/qtquickcontrols b/qtquickcontrols index 4e156bb2..b37db1f3 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 4e156bb26fb904663b0e13df1802dc2e0788b114 +Subproject commit b37db1f31b3248e9d32d0ccbb42e77035fa5b340 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index da06da57..6a3356df 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit da06da57002b64cf4bcde0ca708b3275a5f919ae +Subproject commit 6a3356dfd8a98131d2912d16c666419d5eeaa10e diff --git a/qtremoteobjects b/qtremoteobjects index 2bcda9d9..c76dfdc3 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 2bcda9d9f45858ac196d9972162c870ac0a6f217 +Subproject commit c76dfdc3eafe1d2129761951c3ca6970699badfb diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 47d15b13..0ae9f37f 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 47d15b1378621041f612b395ded685fa4e6fbbd0 +Subproject commit 0ae9f37f9771f0b6536b28202e46c21d5995f13e diff --git a/qtwebengine b/qtwebengine index 5c579b95..dbc0d09b 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 5c579b95c81388c9b596b209380a1a061718f5c6 +Subproject commit dbc0d09be2bbc3dce01ace956f534c4012402fba diff --git a/qtxmlpatterns b/qtxmlpatterns index 1fe82f96..cdf3aa96 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 1fe82f967320b3c65f29ed704862f8c34a6c0c87 +Subproject commit cdf3aa96879b7f5f0bd9bec9d1bd8dd624beee28 From 885e662082f27938b4d56ba2e14d044af5fb821f Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 3 Sep 2019 07:55:23 +0200 Subject: [PATCH 039/105] Update submodules on '5.13' in qt5 Change-Id: I30e7dbbbc47d26fcd8d7f802b7f46b635c14a858 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdoc | 2 +- qtquickcontrols2 | 2 +- qtrepotools | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qt3d b/qt3d index dcd99cbf..41ffdd54 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit dcd99cbfd756276194ab462df4b9e26b932097b6 +Subproject commit 41ffdd54c743cca0a9f88f5513c7f5efa8cd2cba diff --git a/qtbase b/qtbase index 375f5650..1c55a6ca 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 375f56506089f98118aa1848ed9f05a35e212c90 +Subproject commit 1c55a6caf1fc2b8a73a9a756bcf6894c5d4e4398 diff --git a/qtdoc b/qtdoc index afab7f53..9e89b901 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit afab7f53a969a40037aab50572d837481c9c32ce +Subproject commit 9e89b901bd97e2fb6ad54a24c1bbb345d5610e2c diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 95383bf8..8701410f 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 95383bf86c0a49fea8ec47d1400067ead53749a9 +Subproject commit 8701410f8c0e179c9cca51b08fcc6491a288ee84 diff --git a/qtrepotools b/qtrepotools index 157ec79c..37df2fd6 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 157ec79c64c8aba721536a4f06f656a2af15d4d3 +Subproject commit 37df2fd634feac3458c19b8a37a44a36f8e3a72f From 5035d3852542ea5a1cd6bb2afc48d095582389eb Mon Sep 17 00:00:00 2001 From: Tuomas Heimonen Date: Tue, 3 Sep 2019 08:57:58 +0300 Subject: [PATCH 040/105] Saferenderer: Update qtci-linux-RHEL-7.4-x86_64 static build Add build flag '-qpa offscreen' to remove dependency to xcb libraries Task-number: QSR-510 Change-Id: Icc87face742abe775147d9bf931dbbdaee81fab1 Reviewed-by: Jukka Jokiniva --- coin/platform_configs/qtsaferenderer.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index 6c71e719..ac4d8c4a 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -11,4 +11,4 @@ Template: 'qtci-linux-RHEL-7.4-x86_64' Compiler: 'GCC' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -static -nomake tests -nomake examples -no-use-gold-linker -no-icu -no-fontconfig -qt-freetype -qt-libpng' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -static -nomake tests -nomake examples -no-use-gold-linker -no-icu -no-fontconfig -qt-freetype -qpa offscreen -qt-libpng' From c398a50e2d2d80febb0defa903b63c267b809b3d Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 3 Sep 2019 21:55:40 +0200 Subject: [PATCH 041/105] Update submodules on '5.12' in qt5 Change-Id: I3467f8edbbd5c52f53ed786c2c0f185e8558c1f6 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtrepotools | 2 +- qttools | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qt3d b/qt3d index 151694c0..a802fd74 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 151694c095e05e1c735f96f60c799cc717e93dc1 +Subproject commit a802fd74e010a6d8ebfc2243232e0373d67f3df6 diff --git a/qtbase b/qtbase index 7b2dfb37..1b0c45f6 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 7b2dfb37ee5a4252d83e7b08970107a15561fe61 +Subproject commit 1b0c45f683cef20aacc8f40273aa89200e9924e4 diff --git a/qtdeclarative b/qtdeclarative index 35acc9fc..db3dd029 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 35acc9fc3c41446bacbbfe754f7f494de7f62411 +Subproject commit db3dd029d7cd911712102efd5ea71868494f9f6f diff --git a/qtdoc b/qtdoc index 05ad406b..20760875 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 05ad406b9d1673d96f187c3474d6f4de3cdc7240 +Subproject commit 20760875388251e462042dc9a03292dcaa019d29 diff --git a/qtrepotools b/qtrepotools index 157ec79c..37df2fd6 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 157ec79c64c8aba721536a4f06f656a2af15d4d3 +Subproject commit 37df2fd634feac3458c19b8a37a44a36f8e3a72f diff --git a/qttools b/qttools index a8aa0849..121887b0 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit a8aa08498a7a16b40a4559034abb47e37d719ba4 +Subproject commit 121887b051150af7490f79402248e92c7d7d0f0a From f3c4f6edeb67cf526c3461078758ec88566bf120 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 3 Sep 2019 21:53:56 +0200 Subject: [PATCH 042/105] Update submodules on '5.13' in qt5 Change-Id: I653ae34a4544c7a9beb59cced2ce91d6512c67a8 Reviewed-by: Liang Qi --- qtbase | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtbase b/qtbase index 1c55a6ca..db57af5a 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 1c55a6caf1fc2b8a73a9a756bcf6894c5d4e4398 +Subproject commit db57af5a0d7aa0687a19fef1cd385bee0f26f7b6 diff --git a/qtwayland b/qtwayland index cd2c3a89..2950ab90 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit cd2c3a8916a9cc7ab31f6e18e6f1510a048f4ace +Subproject commit 2950ab906db92ad0e00a1113fb0027b76e6c8ac0 diff --git a/qtwebengine b/qtwebengine index 81d103b4..5ff6ecf1 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 81d103b44d620c4c170c7a80e06149b5011753fb +Subproject commit 5ff6ecf1cabcc93700d7997c2e22e14a84743d33 From 7fd2796b00efbb9869c23143cd32f37d42c83766 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 4 Sep 2019 12:05:02 +0300 Subject: [PATCH 043/105] Provisioning: Update Android NDK version to macOS 10.14 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Currently we are provisioning older Android NDK version than the one used in macOS 10.13. Let's keep these sync even though we don't currently make Android builds with macOS 10.14 Change-Id: I6c284d50bac395eb474c0f7e34cd90eda3f180c3 Reviewed-by: Johanna Äijälä --- coin/provisioning/qtci-macos-10.14-x86_64/30-android.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/30-android.sh b/coin/provisioning/qtci-macos-10.14-x86_64/30-android.sh index c0d75ff6..d0acdd45 100755 --- a/coin/provisioning/qtci-macos-10.14-x86_64/30-android.sh +++ b/coin/provisioning/qtci-macos-10.14-x86_64/30-android.sh @@ -51,7 +51,7 @@ toolsVersion="r26.1.1" # toolsFile dertermines tools version toolsFile="sdk-tools-darwin-4333796.zip" -ndkVersion="r18b" +ndkVersion="r19c" ndkFile="android-ndk-$ndkVersion-darwin-x86_64.zip" sdkBuildToolsVersion="28.0.3" # this is compile sdk version From 30e7bf5745835e1b2f78fc6244dd89aa4cdb0b0a Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Wed, 4 Sep 2019 12:00:38 +0300 Subject: [PATCH 044/105] Provisioning: Add Android NDK ROOT to environment variable MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-3181 Task-number: QTBUG-74952 Change-Id: I4cc6936c3b3eef32a1013888ced3950cd1f39407 Reviewed-by: Johanna Äijälä --- coin/provisioning/qtci-macos-10.14-x86_64/30-android.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/30-android.sh b/coin/provisioning/qtci-macos-10.14-x86_64/30-android.sh index d0acdd45..544364b0 100755 --- a/coin/provisioning/qtci-macos-10.14-x86_64/30-android.sh +++ b/coin/provisioning/qtci-macos-10.14-x86_64/30-android.sh @@ -76,6 +76,7 @@ ls -l "$sdkTargetFolder" SetEnvVar "ANDROID_SDK_HOME" "$sdkTargetFolder" SetEnvVar "ANDROID_NDK_HOME" "$targetFolder/android-ndk-$ndkVersion" +SetEnvVar "ANDROID_NDK_ROOT" "$targetFolder/android-ndk-$ndkVersion" SetEnvVar "ANDROID_NDK_HOST" "darwin-x86_64" SetEnvVar "ANDROID_API_VERSION" "$sdkApiLevel" From 1c5e02896cd70b03e0f2d013cc98f1c6a8675338 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 4 Sep 2019 10:06:10 +0000 Subject: [PATCH 045/105] Update submodules on '5.12.5' in qt5 Change-Id: Ife588e41d563bf4246ed7eff14186aa7583b3397 Reviewed-by: Jani Heikkinen --- qt3d | 2 +- qtbase | 2 +- qtdoc | 2 +- qtqa | 2 +- qtrepotools | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qttools | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qt3d b/qt3d index 29541954..bbe0805b 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 29541954dc1ab128295487f25067876d9967b2f9 +Subproject commit bbe0805bfddcb61f7c07a6454793e76f142a32bc diff --git a/qtbase b/qtbase index 7b82d274..abfb1b86 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 7b82d27429cde931114776f1a26f4c3850c8bb72 +Subproject commit abfb1b8665923ce2824392f3a04e5e4ac3871017 diff --git a/qtdoc b/qtdoc index 66db05b5..88ef254d 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 66db05b51f337ea3a8c553a57cdbaabdb2aff375 +Subproject commit 88ef254d246c3c3d3ec3dccc649253e4aa01630c diff --git a/qtqa b/qtqa index 8a79bcdf..3cbc0456 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 8a79bcdf467d9e1e16821fdb3aff9ee8e3c652dd +Subproject commit 3cbc0456a5c238c755e47c49ee4b047836eae5eb diff --git a/qtrepotools b/qtrepotools index 157ec79c..37df2fd6 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 157ec79c64c8aba721536a4f06f656a2af15d4d3 +Subproject commit 37df2fd634feac3458c19b8a37a44a36f8e3a72f diff --git a/qtsensors b/qtsensors index 70c2dd24..b92ff799 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 70c2dd24800527908e92fb0ce181b939dbd6141e +Subproject commit b92ff799f71d0de7d6ba5b5dd59a6e50087c2f42 diff --git a/qtserialbus b/qtserialbus index 4fb3e302..c8645af3 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 4fb3e302a30c675b3d515d6eb5dd08301727d4c1 +Subproject commit c8645af35accdfadfa2b29cd897f77b6e15704c8 diff --git a/qttools b/qttools index a8aa0849..911477d8 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit a8aa08498a7a16b40a4559034abb47e37d719ba4 +Subproject commit 911477d8da320db645db2b6b6180f1193ba7d36f From 14c31bf8db92b6c09e669b7c3b0d62261e5bbd46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Tue, 3 Sep 2019 16:01:35 +0200 Subject: [PATCH 046/105] Remove un-needed configure arguments for Apple OSes Change-Id: I18bab0c70bbb9486eef815f9310dd807ae5cde83 Reviewed-by: Timur Pocheptsov --- coin/platform_configs/default.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index cc1f7083..eeeffda8 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -94,16 +94,16 @@ Template: 'qtci-macos-10.13-x86_64-2' Compiler: 'Clang' Features: ['Packaging'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -nomake tests -nomake examples -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -xplatform macx-clang -separate-debug-info -sdk macosx -device-option QMAKE_APPLE_DEVICE_ARCHS=x86_64 -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include' + Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -separate-debug-info -nomake tests -nomake examples -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include' - Template: 'qtci-macos-10.14-x86_64' Compiler: 'Clang' Features: ['DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -nomake tests -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -xplatform macx-clang -separate-debug-info -sdk macosx -device-option QMAKE_APPLE_DEVICE_ARCHS=x86_64 -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include' + Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -release -separate-debug-info -nomake tests -no-sql-mysql -plugin-sql-psql -plugin-sql-sqlite -sysconfdir /Library/Preferences/Qt -I/usr/local/opt/openssl/include' - Template: 'qtci-macos-10.12-x86_64-9' Compiler: 'Clang' - Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -developer-build -release -qtnamespace TestNamespace -nomake tests -nomake examples -no-pch -no-framework -xplatform macx-clang -sdk macosx -device-option QMAKE_APPLE_DEVICE_ARCHS=x86_64 -I/usr/local/opt/openssl/include' + Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -developer-build -release -no-pch -no-framework -qtnamespace TestNamespace -nomake tests -nomake examples -I/usr/local/opt/openssl/include' - Template: 'qtci-macos-10.13-x86_64-2' Target os: 'IOS_ANY' From be97b9ad72c04f622aa0843970b94761360d419f Mon Sep 17 00:00:00 2001 From: Tuomas Heimonen Date: Thu, 5 Sep 2019 12:04:35 +0300 Subject: [PATCH 047/105] Saferenderer: Update qtci-linux-RHEL-7.4-x86_64 static build Add build flag '-no-xcb' to remove xcb from static build Task-number: QSR-517 Change-Id: I9b77cd0ada41490233ec2aedb877a37bf2648a1b Reviewed-by: Jukka Jokiniva --- coin/platform_configs/qtsaferenderer.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index ac4d8c4a..ce537865 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -11,4 +11,4 @@ Template: 'qtci-linux-RHEL-7.4-x86_64' Compiler: 'GCC' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -static -nomake tests -nomake examples -no-use-gold-linker -no-icu -no-fontconfig -qt-freetype -qpa offscreen -qt-libpng' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -static -nomake tests -nomake examples -no-use-gold-linker -no-icu -no-fontconfig -qt-freetype -qpa offscreen -no-xcb -qt-libpng' From 0d273deeef0c2ea44cd862a1df756ab99cf2926d Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Wed, 4 Sep 2019 09:54:10 +0300 Subject: [PATCH 048/105] Provisioning: Fix version of libiodbc on MacOs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit libiodbc latest version (3.52.13) was automatically installed causing qt-config-gui to fail build, this installs version 3.52.12. Task-number: QTQAINFRA-3188 Change-Id: I5b87ff04c2301a5471cc9abfa0849b6073a1bdd4 Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/macos/libiodbc.rb | 23 ++++++++++++++++++++++ coin/provisioning/common/macos/libiodbc.sh | 2 +- 2 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 coin/provisioning/common/macos/libiodbc.rb diff --git a/coin/provisioning/common/macos/libiodbc.rb b/coin/provisioning/common/macos/libiodbc.rb new file mode 100644 index 00000000..ed669e69 --- /dev/null +++ b/coin/provisioning/common/macos/libiodbc.rb @@ -0,0 +1,23 @@ +class Libiodbc < Formula + desc "Database connectivity layer based on ODBC. (alternative to unixodbc)" + homepage "http://www.iodbc.org/dataspace/iodbc/wiki/iODBC/" + url "https://github.com/openlink/iODBC/archive/v3.52.12.tar.gz" + sha256 "b2cab4f8fbd5388344d7ee0deb1a32310795b1e631c3505a5b515d90186e2516" + + depends_on "autoconf" => :build + depends_on "automake" => :build + depends_on "libtool" => :build + + conflicts_with "unixodbc", :because => "both install 'odbcinst.h' header" + + def install + system "./autogen.sh" + system "./configure", "--prefix=#{prefix}" + system "make", "install" + end + + test do + system bin/"iodbc-config", "--version" + end +end + diff --git a/coin/provisioning/common/macos/libiodbc.sh b/coin/provisioning/common/macos/libiodbc.sh index 79fa86c2..4ba0bbc3 100755 --- a/coin/provisioning/common/macos/libiodbc.sh +++ b/coin/provisioning/common/macos/libiodbc.sh @@ -41,7 +41,7 @@ set -ex source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" brew update -brew install libiodbc +brew install ${BASH_SOURCE%/*}/libiodbc.rb # CPLUS_INCLUDE_PATH is set so clang and configure can find libiodbc From f0a89a32daa0554d00ed6f777f2100ff20068dd1 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Thu, 5 Sep 2019 13:26:57 +0200 Subject: [PATCH 049/105] Update submodules on '5.14' in qt5 Change-Id: Ice4211fcc08fa25a55d6a5be1b236b3bdc12c9e1 Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtremoteobjects | 2 +- qtrepotools | 2 +- qtscript | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtsvg | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtxmlpatterns | 2 +- 25 files changed, 25 insertions(+), 25 deletions(-) diff --git a/qt3d b/qt3d index 00e12527..114600e0 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 00e12527dbaacf700ff7a22177a96c5628709fae +Subproject commit 114600e0a4ad6481d027bb7c4f206aac09a7bc13 diff --git a/qtactiveqt b/qtactiveqt index 89e2d977..e9f78ada 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 89e2d977323e874b4074aa1b969a4be5141184b8 +Subproject commit e9f78adad0205ff539a35587be86c8e7a0bfd5bd diff --git a/qtandroidextras b/qtandroidextras index 79052c5b..d9378c43 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 79052c5be918a18ca6d02bbf6118088ba3e333a1 +Subproject commit d9378c4324ddf6febbcd0e4ae052b384f75acca4 diff --git a/qtbase b/qtbase index c28b881c..46ec24d2 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit c28b881c98fadcd3415370fad2525b558f6b03e4 +Subproject commit 46ec24d2b9a0fb1d59955f11dab0ead05dd017f9 diff --git a/qtconnectivity b/qtconnectivity index ccc1544f..a309d04f 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit ccc1544f5ff929f466df8c790a4e7595e177a720 +Subproject commit a309d04fa1edb3fa320d420758b3967616ad792a diff --git a/qtdatavis3d b/qtdatavis3d index 7bd8bf6c..548b93d6 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 7bd8bf6cf8cf6b1f00085c27fd03fbe93010c670 +Subproject commit 548b93d6e5e70afeb220502170a51cc2e2510139 diff --git a/qtdeclarative b/qtdeclarative index a16e802b..f862b3ed 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit a16e802b3d11781a1509e61da43978893989d7a2 +Subproject commit f862b3edeb8a96a49a5d12620506d33d5a5aadca diff --git a/qtdoc b/qtdoc index f6ee83c9..e97ff5ea 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit f6ee83c936dd68f053effbda5157285ae2ecc717 +Subproject commit e97ff5ea10f780fa44ec2481a6fb71a91cdac06e diff --git a/qtimageformats b/qtimageformats index 17b50307..44000c87 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 17b503073d5aeb505c15ef94f5af10d76898b1cf +Subproject commit 44000c87d352e4f88b7eea3d441a807b755698d3 diff --git a/qtlocation b/qtlocation index f613eb3a..d7761951 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit f613eb3a6031d6d4f3e5ee230fab3056314fa9a4 +Subproject commit d776195186a53fcfaa5270d139df4b13298fe40b diff --git a/qtmultimedia b/qtmultimedia index dd56d0fd..b2a5fc61 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit dd56d0fd8b45566c491ef30624177919eee621b4 +Subproject commit b2a5fc61ad374503ace4c96c68fbfc5a6670b8fa diff --git a/qtqa b/qtqa index 68a9cf7c..3cbc0456 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 68a9cf7cf8169589bfd1e9539a8695e661d1b036 +Subproject commit 3cbc0456a5c238c755e47c49ee4b047836eae5eb diff --git a/qtquick3d b/qtquick3d index a949102d..cb674f11 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit a949102dd14d92532644cae8696d04bc8aa5a646 +Subproject commit cb674f118872fdc417df0089268892131462dc6f diff --git a/qtremoteobjects b/qtremoteobjects index e7e372d6..acb75637 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit e7e372d6e4eedb473986189cc18a0b8ba71ecc57 +Subproject commit acb75637a429d1a540b0b86b35554f75bd13b44b diff --git a/qtrepotools b/qtrepotools index 157ec79c..37df2fd6 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 157ec79c64c8aba721536a4f06f656a2af15d4d3 +Subproject commit 37df2fd634feac3458c19b8a37a44a36f8e3a72f diff --git a/qtscript b/qtscript index 44a9b1ff..1de1f080 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 44a9b1ffbbd6ea127a2e8ce22dd5d87ef7474faf +Subproject commit 1de1f080ef4b37576843bd59a8aa3e484c918820 diff --git a/qtscxml b/qtscxml index 8388555f..07c62001 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 8388555ffb1da9cd5e714dfba6545736e6e2b496 +Subproject commit 07c62001b55b515629062ccc51e8c12aaa7d4eec diff --git a/qtsensors b/qtsensors index f8f2c4a5..c4519ffc 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit f8f2c4a5d0640090fd50656b1b585c0c3a0936bb +Subproject commit c4519ffcfc009d4ffbfa77bfa1b7c9749b9fe7dc diff --git a/qtserialbus b/qtserialbus index 45f9593e..535615a4 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 45f9593eff1141e7a86cda4f3dd2380c237c9f54 +Subproject commit 535615a4dc6430ac4b0512b6705721c75e160b10 diff --git a/qtsvg b/qtsvg index 9d274388..d8ccc52c 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 9d274388f620dfafe0bc8fe0855ce0c8e8ae7892 +Subproject commit d8ccc52c038a033b20c96041b998322a907521c4 diff --git a/qttools b/qttools index b5e21475..2174b1a3 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit b5e21475344d575a7f07f9d6f3dd2a9d82cf4a50 +Subproject commit 2174b1a34a0754376b77528161bf2328855cb0e7 diff --git a/qtwayland b/qtwayland index 32f3f85b..f1148d63 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 32f3f85b3ba044d9eb35996eb8df84b9822b2fd7 +Subproject commit f1148d63430347af03827c995bf68f86793c7ae0 diff --git a/qtwebengine b/qtwebengine index 1bb41f14..68539693 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 1bb41f149bf2d3ad63442ae6058a4446344123c9 +Subproject commit 68539693fe022595b2e4fbecd448b2fca5e7d3e5 diff --git a/qtwebsockets b/qtwebsockets index 187d767f..597d005c 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 187d767f10a4319db2f442dfed080bbcbaccaa27 +Subproject commit 597d005c053503e104755bcb7156c0ab2bedfe15 diff --git a/qtxmlpatterns b/qtxmlpatterns index 9da08816..85bec28a 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 9da08816e1072fc1391377a38d6afd9e73d756e0 +Subproject commit 85bec28aafc05c9b1fe3428832ee18af82747123 From d581d86fc50bff5e64821b20babaa801102d1a24 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Wed, 14 Aug 2019 15:59:39 +0300 Subject: [PATCH 050/105] Provisioning: update QEMU toolchains MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Update QEMU toolchains to Yocto thud(2.6) release(DC Qt 5.13.0) with GCC 8.2.0. * Suppress QEMU "Unsupported syscall" and "Unsupported ioctl" logs, set environment variable QEMU_SYSCALL_DEBUG to show them. Task-number: QTQAINFRA-2808 Change-Id: I987353b0f3aff87a02ea3bf96ace8de32d6f557b Reviewed-by: Liang Qi Reviewed-by: Tony Sarajärvi --- coin/platform_configs/default.yaml | 7 +++- coin/platform_configs/qtbase.yaml | 2 +- coin/platform_configs/qtdeclarative.yaml | 2 +- .../04-yocto.sh | 38 +++++++++---------- 4 files changed, 27 insertions(+), 22 deletions(-) diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index b5a53ed9..f0be377e 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -1,3 +1,6 @@ +Version: 2 +Module only: True +Configurations: - Template: 'qtci-windows-10-x86_64-14' Compiler: 'MSVC2015' @@ -147,12 +150,14 @@ Target os: 'QEMU' Target arch: 'armv7' Compiler: 'GCC' - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib' + Environment variables: ['GST_PLUGIN_SCANNER=/opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/usr/libexec/gstreamer-1.0/gst-plugin-scanner'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib' - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Target os: 'QEMU' Target arch: 'arm64' Compiler: 'GCC' + Environment variables: ['GST_PLUGIN_SCANNER=/opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/libexec/gstreamer-1.0/gst-plugin-scanner'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-generic-g++ -device-option CROSS_COMPILE=/opt/yocto-arm64/sysroots/x86_64-pokysdk-linux/usr/bin/aarch64-poky-linux/aarch64-poky-linux- -device-option DISTRO_OPTS=boot2qt -sysroot /opt/yocto-arm64/sysroots/aarch64-poky-linux -extprefix /home/qt/work/install -mysql_config /opt/yocto-arm64/sysroots/aarch64-poky-linux/usr/bin/mysql_config -psql_config /dev/null -tslib' - Template: 'qtci-linux-Ubuntu-18.04-x86_64' diff --git a/coin/platform_configs/qtbase.yaml b/coin/platform_configs/qtbase.yaml index 374d9cb0..fae959fc 100644 --- a/coin/platform_configs/qtbase.yaml +++ b/coin/platform_configs/qtbase.yaml @@ -4,7 +4,7 @@ Target arch: 'armv7' Compiler: 'GCC' Features: ['DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib' - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Target os: 'QEMU' diff --git a/coin/platform_configs/qtdeclarative.yaml b/coin/platform_configs/qtdeclarative.yaml index 9327b92e..2bf9118a 100644 --- a/coin/platform_configs/qtdeclarative.yaml +++ b/coin/platform_configs/qtdeclarative.yaml @@ -3,7 +3,7 @@ Target os: 'QEMU' Target arch: 'armv7' Compiler: 'GCC' - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-xcb -R . -openssl -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -sysroot /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/usr/bin/mysql_config -psql_config /dev/null -tslib' - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Target os: 'QEMU' diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh index f43e8fd2..c5289f45 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh @@ -2,7 +2,7 @@ ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -44,14 +44,14 @@ source "${BASH_SOURCE%/*}/../common/unix/SetEnvVar.sh" echo "Installing Yocto toolchain for 32-bit b2qt ARMV7..." -versionARM="2.5.2" -package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarmv7-409ebc3.sh" -PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/sumo/$package" -AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/sumo/$package" -SHA1="a03b4eb492b16c6e60cf83c0718c27e9cfa6d522" +versionARM="2.6.1" +package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarmv7-9e1a27d.sh" +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/thud/$package" +AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/thud/$package" +SHA1="7c76230ef1bb58bf907daa81117d81b48534802c" yoctoInstaller="/tmp/yocto-toolchain-ARMv7.sh" yoctoLocationARMv7="/opt/yocto-armv7" -sysrootARMv7="sysroots/armv7ahf-neon-poky-linux-gnueabi" +sysrootARMv7="sysroots/armv7at2hf-neon-poky-linux-gnueabi" crosscompileARMv7="sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi-" DownloadURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$yoctoInstaller" @@ -62,11 +62,11 @@ rm -rf "$yoctoInstaller" echo "Installing Yocto toolchain for 64-bit b2qt ARM64..." -versionARM64="2.5.2" -package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarm64-409ebc3.sh" -PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/sumo/$package" -AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/sumo/$package" -SHA1="3dadf1135d00f7cb5586b605b1f7344ae828c9cd" +versionARM64="2.6.1" +package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemuarm64-9e1a27d.sh" +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/thud/$package" +AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/thud/$package" +SHA1="598c24b8bcf289bb67a14aea51567c0d00bf5187" yoctoInstaller="/tmp/yocto-toolchain-ARM64.sh" yoctoLocationARM64="/opt/yocto-arm64" sysrootARM64="sysroots/aarch64-poky-linux" @@ -80,11 +80,11 @@ rm -rf "$yoctoInstaller" echo "Installing Yocto toolchain for 64-bit b2qt MIPS64..." -versionMIPS64="2.5.2" -package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemumips64-409ebc3.sh" -PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/sumo/$package" -AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/sumo/$package" -SHA1="dd03b496707ca8888b339a667e021722a8c2fdb4" +versionMIPS64="2.6.1" +package="b2qt-x86_64-meta-toolchain-b2qt-embedded-sdk-qemumips64-9e1a27d.sh" +PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/boot2qt/thud/$package" +AltUrl="http://download.qt.io/development_releases/prebuilt/boot2qt/thud/$package" +SHA1="8cea8504463ab96322e92f3c6e9e922f394ae3c7" yoctoInstaller="/tmp/yocto-toolchain-mips64.sh" yoctoLocationMIPS64="/opt/yocto-mips64" sysrootMIPS64="sysroots/mips64-poky-linux" @@ -115,7 +115,7 @@ echo "Yocto ARM64 toolchain = $versionARM64" >> ~/versions.txt echo "Yocto MIPS64 toolchain = $versionMIPS64" >> ~/versions.txt # List qt user in qemu toolchain sysroots -sudo sh -c "grep ^qt /etc/passwd >> /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/etc/passwd" -sudo sh -c "grep ^qt /etc/group >> /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/etc/group" +sudo sh -c "grep ^qt /etc/passwd >> /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/etc/passwd" +sudo sh -c "grep ^qt /etc/group >> /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/etc/group" sudo sh -c "grep ^qt /etc/passwd >> /opt/yocto-arm64/sysroots/aarch64-poky-linux/etc/passwd" sudo sh -c "grep ^qt /etc/group >> /opt/yocto-arm64/sysroots/aarch64-poky-linux/etc/group" From 15b4e146e574b12f25c0f68522ee7f97a44def6a Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 6 Sep 2019 08:16:34 +0200 Subject: [PATCH 051/105] Update submodules on '5.13' in qt5 Change-Id: Ic653e56614712c8e7dcd5095b8d32f08dea61731 Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtqa | 2 +- qtquickcontrols | 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 +- 36 files changed, 36 insertions(+), 36 deletions(-) diff --git a/qt3d b/qt3d index 41ffdd54..a79b9874 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 41ffdd54c743cca0a9f88f5513c7f5efa8cd2cba +Subproject commit a79b9874e7b7eb9af765c2460aa3b4e83dfb446e diff --git a/qtactiveqt b/qtactiveqt index 6746b4c3..e32e8fc9 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 6746b4c3736eb08721e68f3a051bf27b699487f3 +Subproject commit e32e8fc9c7aeb3c0326bf370e1a57ce914954500 diff --git a/qtandroidextras b/qtandroidextras index 53e99cbb..231ebc72 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 53e99cbb2f73efd6e4adc7b13400fdc7fc74f345 +Subproject commit 231ebc725d42ca82d1f1a6eecc47a2bdd39769e8 diff --git a/qtbase b/qtbase index db57af5a..e21fa577 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit db57af5a0d7aa0687a19fef1cd385bee0f26f7b6 +Subproject commit e21fa577dde32849fdaa744f30ad3b23d63b7214 diff --git a/qtcharts b/qtcharts index a9c48f8e..9439312d 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit a9c48f8ea7fd8634263124a742e23bc992fd855e +Subproject commit 9439312d27d89b8f6df57a5f24f04b4de2e67642 diff --git a/qtconnectivity b/qtconnectivity index e4138bd7..dd4593c6 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit e4138bd7b2b6ab6c544ad5ab49cf2c193c7cd9a2 +Subproject commit dd4593c61e4b77c4e3b1ee516a1e8825ebb0197b diff --git a/qtdatavis3d b/qtdatavis3d index b0114f0d..cd09330c 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit b0114f0dcba2d1709aac47530febc51e5078593e +Subproject commit cd09330ce6304359ded5217ae28d2617144c36a5 diff --git a/qtdeclarative b/qtdeclarative index 98f29914..f19ec456 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 98f29914e4e233358ef31068542fceeea92eda97 +Subproject commit f19ec4561b4975d68290593b599d3c38d0f9f6d3 diff --git a/qtdoc b/qtdoc index 9e89b901..bf10f7e7 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 9e89b901bd97e2fb6ad54a24c1bbb345d5610e2c +Subproject commit bf10f7e76139a5d31c59c58b5431f3deb99afcaf diff --git a/qtgamepad b/qtgamepad index 027a1dfd..d4a8e16f 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 027a1dfd3eca382dab3f3f17e7f43ccb84e329be +Subproject commit d4a8e16f573c77eae966e942ecf6c7f95d0d5baa diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 60bf7dec..4d1c22f7 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 60bf7decc8e063c9fbe63816578f116bc4eebae4 +Subproject commit 4d1c22f7596a76e0bbac1b1652685247b3ff26ca diff --git a/qtimageformats b/qtimageformats index f8b773d1..f5c2d74b 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit f8b773d1d4b2f153eb97578ba5e49fd43564f7fb +Subproject commit f5c2d74b8de61164dc5d0abd21b86a9233ead02f diff --git a/qtmacextras b/qtmacextras index f44061fa..b8584e85 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit f44061fa0547d048661d1efa8444da7c757fa39c +Subproject commit b8584e85ab970f18d2697c1146728dbbf7eafdc2 diff --git a/qtmultimedia b/qtmultimedia index 03188b88..d31e5042 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 03188b88025a849e15125eecb21395fa7f9a0158 +Subproject commit d31e5042ed6d8c1bd4dafe980eb90db4fc3e63de diff --git a/qtnetworkauth b/qtnetworkauth index c2bf9b42..6c9e2b87 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit c2bf9b420f29e4b001d6f85b918be5fb89c87564 +Subproject commit 6c9e2b87fc8a0e19f6e3da6d877146bd680bca56 diff --git a/qtpurchasing b/qtpurchasing index a0f911a2..d2da2243 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit a0f911a29eb055de1e9dc2d3e78a1f03ccead5da +Subproject commit d2da22432886b2bd506e547c5f8f8cfa24e55db4 diff --git a/qtqa b/qtqa index 8a79bcdf..3cbc0456 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 8a79bcdf467d9e1e16821fdb3aff9ee8e3c652dd +Subproject commit 3cbc0456a5c238c755e47c49ee4b047836eae5eb diff --git a/qtquickcontrols b/qtquickcontrols index b1f360c0..0f7ad499 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit b1f360c0b0f42b4536cb0bcecd06e76052ec77ef +Subproject commit 0f7ad49951419199d7042bdf91649a50e309059a diff --git a/qtscript b/qtscript index 590a5ffc..0881a7d7 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 590a5ffcb76157f4278e2778135d8d17bc815295 +Subproject commit 0881a7d7887c4a78030432d9acee7305bc8960b8 diff --git a/qtscxml b/qtscxml index 9790a020..2a5a794e 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 9790a020801b900cff362a7c1ab808471c97835d +Subproject commit 2a5a794e26dfc094323f73383381233c8f00ef3c diff --git a/qtsensors b/qtsensors index 47d1ff28..11c91568 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 47d1ff2813575981d02434d6cffd6384687f832b +Subproject commit 11c91568f342b226b8d34268bcf25d118779353d diff --git a/qtserialbus b/qtserialbus index 7e8ad7f0..75e5dd86 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 7e8ad7f0bb43a3235fbf8e099e853ec3e2ce8a25 +Subproject commit 75e5dd86266b8b03761d685cb042deaa36415a92 diff --git a/qtserialport b/qtserialport index 50372ac8..8a0f4a01 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 50372ac8f941a06b30f41624d819c4e5513f6b62 +Subproject commit 8a0f4a01a180798cd2c65295f5e1f91c9a3ff88e diff --git a/qtspeech b/qtspeech index aa450db4..2783f4e2 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit aa450db462db5fca847ed05c1e05c1779161cc8b +Subproject commit 2783f4e2695ef023b3721692080ac0f2ec62a559 diff --git a/qtsvg b/qtsvg index fc2bc2db..9f8a8f8b 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit fc2bc2db0ed8887253a2e0a41634e7d22af00283 +Subproject commit 9f8a8f8b4c137b1aef0a9873f46a29b5807ed56d diff --git a/qttools b/qttools index 8d3c4050..1a858d32 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 8d3c4050b3787b3572da9f32d7ae41069706cc96 +Subproject commit 1a858d32fef239bca95b72b8fd2186b30983a2af diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 6143eec2..21e5ab03 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 6143eec2525af08e6aab895bcf64c2745a427f13 +Subproject commit 21e5ab030d2f735560b7ab381dfaf8d468c247ff diff --git a/qtwayland b/qtwayland index 2950ab90..53ab5e77 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 2950ab906db92ad0e00a1113fb0027b76e6c8ac0 +Subproject commit 53ab5e7748340f922f7f32c7d2db4965aa8c2ff2 diff --git a/qtwebchannel b/qtwebchannel index 018b2740..6995ffbf 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 018b2740f793e1f4142d95736ff0554aa4e0a71d +Subproject commit 6995ffbf54cba31e081ed729d9f44aee88d3bb91 diff --git a/qtwebengine b/qtwebengine index 5ff6ecf1..15f34fb4 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 5ff6ecf1cabcc93700d7997c2e22e14a84743d33 +Subproject commit 15f34fb479567dc728fedf3ab2d13a86bf421c59 diff --git a/qtwebglplugin b/qtwebglplugin index 95957bbe..514f8a63 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 95957bbecc40e5efb163ab123c2a7d8d04005bef +Subproject commit 514f8a63d8e4b915bb8c51248ca811306f267286 diff --git a/qtwebsockets b/qtwebsockets index 1deee2a4..e5f1f3d7 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 1deee2a4965fd7dc8a44c6d769519c4cbb11da4f +Subproject commit e5f1f3d74731416a2acc0f9272dd450f4eabccf6 diff --git a/qtwebview b/qtwebview index 5c80bba0..2c6f39f0 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 5c80bba07d09f498027586a32b0f937d26cca1dd +Subproject commit 2c6f39f051eb40a4ce0421fbcfcd79a094591f24 diff --git a/qtwinextras b/qtwinextras index da9ce653..7364f281 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit da9ce653ee04b9b93cfa95d4d7071d0153286c71 +Subproject commit 7364f281b54ff12f1f433aa7dc4e257c843f6e12 diff --git a/qtx11extras b/qtx11extras index 9f325067..24ac774e 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 9f325067de14ffbed42775c2a3d1f9570bf696ae +Subproject commit 24ac774e9508fa4e2b9bcd9af70d2cdead820b37 diff --git a/qtxmlpatterns b/qtxmlpatterns index 84e44bf5..68a4f3d6 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 84e44bf5a9e5dcb0f93c55129f565e34edb7dd1a +Subproject commit 68a4f3d62bcde501db1592297291a92661346f80 From 1d956e93d081be19e3951d9e91bf2d3d6aedfaa5 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 6 Sep 2019 13:27:02 +0200 Subject: [PATCH 052/105] Update submodules on '5.12' in qt5 Change-Id: I7059a96dccad04c8647443c8b8e13c2ca88fc5b3 Reviewed-by: Liang Qi --- qtbase | 2 +- qtqa | 2 +- qtquickcontrols2 | 2 +- qttools | 2 +- qtwayland | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qtbase b/qtbase index 1b0c45f6..d1a22bd2 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 1b0c45f683cef20aacc8f40273aa89200e9924e4 +Subproject commit d1a22bd29856807805fa56608d2953c072df0cf1 diff --git a/qtqa b/qtqa index 8a79bcdf..cd7003a5 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 8a79bcdf467d9e1e16821fdb3aff9ee8e3c652dd +Subproject commit cd7003a5bb8cf022044ee0fe0e10e5e601dbfcf2 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 5189f2bc..382531ab 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 5189f2bc470da7ff6ae83d0108dd4e6abf35e04e +Subproject commit 382531ab5e2270833d3805c57c00ebcf6b24d635 diff --git a/qttools b/qttools index 121887b0..3480921b 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 121887b051150af7490f79402248e92c7d7d0f0a +Subproject commit 3480921b44f7a4dc8a38656a9722c1507a1b840a diff --git a/qtwayland b/qtwayland index 2e9c90aa..481cea71 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 2e9c90aaefdfe5f1e9b90159c5e6981230627055 +Subproject commit 481cea71043dabf6d5ff33101a66693af86438e1 From 0c0ed734ef2cb6eaecbbff4c60b1aa91c546e697 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 7 Sep 2019 13:06:07 +0200 Subject: [PATCH 053/105] Update submodules on '5.13' in qt5 Change-Id: I23ec6312d3bb028effe1f60d2266c5bb212050f5 Reviewed-by: Liang Qi --- qtbase | 2 +- qtlocation | 2 +- qtqa | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qtbase b/qtbase index e21fa577..cc32a691 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit e21fa577dde32849fdaa744f30ad3b23d63b7214 +Subproject commit cc32a691936f37eaaec618a71edd62f896009c9d diff --git a/qtlocation b/qtlocation index f8c1007e..5a241342 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit f8c1007e513b7df017ae4da2831183f3a66b69fb +Subproject commit 5a2413424911dd1491945c3baf341219110f8f2a diff --git a/qtqa b/qtqa index 3cbc0456..cd7003a5 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 3cbc0456a5c238c755e47c49ee4b047836eae5eb +Subproject commit cd7003a5bb8cf022044ee0fe0e10e5e601dbfcf2 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 8701410f..caf39510 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 8701410f8c0e179c9cca51b08fcc6491a288ee84 +Subproject commit caf39510ea761ebbd719c47e70f5fa88881f0b0b diff --git a/qtremoteobjects b/qtremoteobjects index e2eeee25..7ec7aa57 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit e2eeee25f8b76b1f7b1c9b69b2417c2f6a4553d6 +Subproject commit 7ec7aa570f45aba02b7e6f00cf2a92ab4def3387 From ad93109d926e5b690c8f1e300f3ad03303282b02 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Thu, 5 Sep 2019 11:58:37 +0300 Subject: [PATCH 054/105] Provisioning: Add emsdk to macOS 10.14 Task-number: QTQAINFRA-3191 Change-Id: I46a72db63966804b33996d8bc3babe50cd2a41dd Reviewed-by: Liang Qi --- coin/provisioning/qtci-macos-10.14-x86_64/36-emsdk.sh | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100755 coin/provisioning/qtci-macos-10.14-x86_64/36-emsdk.sh diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/36-emsdk.sh b/coin/provisioning/qtci-macos-10.14-x86_64/36-emsdk.sh new file mode 100755 index 00000000..7396d336 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.14-x86_64/36-emsdk.sh @@ -0,0 +1,6 @@ +#!/usr/bin/env bash + +set -ex + +# shellcheck source=../common/unix/emsdk.sh +source "${BASH_SOURCE%/*}/../common/unix/emsdk.sh" From 6402cb61b8e937ded27ace6875203f7305729592 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 8 Sep 2019 19:46:47 +0200 Subject: [PATCH 055/105] Update submodules on '5.12' in qt5 Change-Id: Ia09d245958bf1e24ba9f95e033dc3803d14edab4 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 +- qtremoteobjects | 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 +- 39 files changed, 39 insertions(+), 39 deletions(-) diff --git a/qt3d b/qt3d index a802fd74..18d84627 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit a802fd74e010a6d8ebfc2243232e0373d67f3df6 +Subproject commit 18d84627842e0ccece92d5e8ed91db537aeeabdb diff --git a/qtactiveqt b/qtactiveqt index 62a802cb..53a70236 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 62a802cbccc18330b010d7197a739d35ba9ae3c7 +Subproject commit 53a70236417ddc9e8c6ca61c1922d42f9957d866 diff --git a/qtandroidextras b/qtandroidextras index 9039930c..43c9c18c 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 9039930c44d94fd101c260ef3abde680fc369501 +Subproject commit 43c9c18c7452fbae249d77f897dfad0bac7f984d diff --git a/qtbase b/qtbase index d1a22bd2..551f73bd 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit d1a22bd29856807805fa56608d2953c072df0cf1 +Subproject commit 551f73bd8d745881e70a7808385f1a35c2d12b2a diff --git a/qtcanvas3d b/qtcanvas3d index 73d5bba6..73671479 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 73d5bba61d4a57dfce92da8c8c4dbda311af977b +Subproject commit 7367147993766f6386502b6ca007432518af3004 diff --git a/qtcharts b/qtcharts index 8b79dba3..1a20ea26 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 8b79dba3fd204ca4161ec7e7293cb95d698ce9db +Subproject commit 1a20ea269d7a8b1779e8e172e5f640f16e9d7169 diff --git a/qtconnectivity b/qtconnectivity index 406b18fd..5d3f494e 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 406b18fdb3704a9e9e66cefbc74e7cff55f1947c +Subproject commit 5d3f494e70db4aaba7356d27ad5e1e861b3a4341 diff --git a/qtdatavis3d b/qtdatavis3d index 54a0844f..5d95f3f3 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 54a0844f5c9c8ec54fcd740b8b99b05fe4532818 +Subproject commit 5d95f3f3716e300748c147e18ae3aecf971857ce diff --git a/qtdeclarative b/qtdeclarative index db3dd029..b0c9c5b8 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit db3dd029d7cd911712102efd5ea71868494f9f6f +Subproject commit b0c9c5b8d9a78b8f9b6bbb32cf17733d4b582810 diff --git a/qtdoc b/qtdoc index 20760875..15135380 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 20760875388251e462042dc9a03292dcaa019d29 +Subproject commit 15135380ecaecb3812c2d07f4d8069f9404c5b92 diff --git a/qtgamepad b/qtgamepad index 656f3c13..c18416a4 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 656f3c134c0cf00743deba3dfaaff7cb5bd17906 +Subproject commit c18416a4c7e62e1febc6f7a3cf4733dd79e7d6ce diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 718d2ec5..16229f68 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 718d2ec554185f91db8e57e6ece14c7cf1b4caef +Subproject commit 16229f68be2c3ad67761c951348bbc5635b6a192 diff --git a/qtimageformats b/qtimageformats index 9100cc7a..2adadf25 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 9100cc7ab04586890fb8f1924b0e06ad3efa7d3e +Subproject commit 2adadf2561e9b475a7f24f782200d5a703e8129a diff --git a/qtlocation b/qtlocation index aa8bb4d6..181f1de8 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit aa8bb4d64864e0c3cfb9374a367e783602b75eba +Subproject commit 181f1de815d2f4b32430f798da255c98dd7859ae diff --git a/qtmacextras b/qtmacextras index 3247a8f3..2115e10d 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 3247a8f30ef1aa26fefc5d8b8f81f35567bf0071 +Subproject commit 2115e10d3ab475ce49fe7c95b8293547be33caf8 diff --git a/qtmultimedia b/qtmultimedia index 94852a47..bbf21e0a 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 94852a47c130c3dc265d900390bf0d7b53cbab3e +Subproject commit bbf21e0a222f4f9bb5acae7b02faddca3b354e4e diff --git a/qtnetworkauth b/qtnetworkauth index ee681478..c277c9b3 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit ee681478c4b05ab6640c0318ed4fa25d62c6f356 +Subproject commit c277c9b3a22db7007a863079dbf500e06824f238 diff --git a/qtpurchasing b/qtpurchasing index 6df36beb..fe396bc6 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 6df36bebdcb0a12069b0cabfed797ebc719b587d +Subproject commit fe396bc6f8e5b024bdc71a5fc252e1a35ac780e9 diff --git a/qtquickcontrols b/qtquickcontrols index 4e156bb2..baf7f594 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 4e156bb26fb904663b0e13df1802dc2e0788b114 +Subproject commit baf7f594a254a56ae94bb01c808c8c72df735745 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 382531ab..188a2210 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 382531ab5e2270833d3805c57c00ebcf6b24d635 +Subproject commit 188a2210348461b3060eddd5c9368759d93d40c6 diff --git a/qtremoteobjects b/qtremoteobjects index 47c6aa50..03d62a73 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 47c6aa50d0423b6ccc40abdc16556d60d4fa9342 +Subproject commit 03d62a73c252d7c23b619eb160568acc61d6b9ea diff --git a/qtscript b/qtscript index efbc554c..f07f14c4 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit efbc554c260f15b5c6dc23759eff96c106997a55 +Subproject commit f07f14c42524f63abf6598647815cea9607e37cf diff --git a/qtscxml b/qtscxml index 9bba89da..839a6b0f 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 9bba89da77b73f016f22bc5d3f195d9c0212c7bc +Subproject commit 839a6b0f9799d2d93b5edae7fb761a4cba755a83 diff --git a/qtsensors b/qtsensors index 70c2dd24..52822ce6 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 70c2dd24800527908e92fb0ce181b939dbd6141e +Subproject commit 52822ce6115e10d9161e01f838210c27835b3b1e diff --git a/qtserialbus b/qtserialbus index 4fb3e302..9b32e787 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 4fb3e302a30c675b3d515d6eb5dd08301727d4c1 +Subproject commit 9b32e78758798ba2a2e97cafde79cc53cad0348f diff --git a/qtserialport b/qtserialport index 9509b6d3..e7d70e34 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 9509b6d3ee02c3c4a0b98dc95bc9787a3c514a18 +Subproject commit e7d70e34509e948ec67a0d9182bdc9dd12f98ac1 diff --git a/qtspeech b/qtspeech index 1c004cd1..cbf37ef4 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 1c004cd1f5c746a00c818bb6621100e82c110de4 +Subproject commit cbf37ef4536fdea8d14aa3db33f4a062da8c9716 diff --git a/qtsvg b/qtsvg index 347de1dd..3394d292 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 347de1dd25366015e3fbbc39ccd1a16ecb18eb2e +Subproject commit 3394d29226541d4b802dca4c8ef7b8817849743c diff --git a/qttools b/qttools index 3480921b..647a9f29 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 3480921b44f7a4dc8a38656a9722c1507a1b840a +Subproject commit 647a9f29035add2b50ac510f0ddc06cb34122435 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 47d15b13..6074356c 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 47d15b1378621041f612b395ded685fa4e6fbbd0 +Subproject commit 6074356c2c84044b65134bd6186171d513703306 diff --git a/qtwayland b/qtwayland index 481cea71..ac80dfb5 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 481cea71043dabf6d5ff33101a66693af86438e1 +Subproject commit ac80dfb5b921437b699a992d1f211e8edf4d7844 diff --git a/qtwebchannel b/qtwebchannel index 8a610433..2b2a24e3 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 8a610433fa26c2601d669b45e903566287923bec +Subproject commit 2b2a24e3a62d1204b9c13c0ae5e1bb4453e02a61 diff --git a/qtwebengine b/qtwebengine index d5d0cd81..594e2b7d 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit d5d0cd81cc770d696b19305717cc827ec1a89bd4 +Subproject commit 594e2b7d381858ae2dc70743824b9bf14b594599 diff --git a/qtwebglplugin b/qtwebglplugin index ae907e4c..04d5b05b 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit ae907e4c0aa5ae78435138f86a7bd888ef0e1e9a +Subproject commit 04d5b05b184fa7b1c8f89462bfc4b31cd43860dd diff --git a/qtwebsockets b/qtwebsockets index dcf08a4c..f35c72e7 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit dcf08a4c702f90cc092629078de48a0ad0d68562 +Subproject commit f35c72e71124c7077b5192944cf9b57966a258bc diff --git a/qtwebview b/qtwebview index de7e4c93..f2123e65 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit de7e4c93c0f17e4608abad31bf7cba06b8fc2e19 +Subproject commit f2123e656868dd1f4869080afa02e4d865b4911e diff --git a/qtwinextras b/qtwinextras index 3fc1164e..553d8468 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 3fc1164ee5464a317ac4daccc4edca09e4cae630 +Subproject commit 553d8468ebbf456355ad280fd3b2c742b38c1d57 diff --git a/qtx11extras b/qtx11extras index 10cc8dec..da2acfc8 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 10cc8dece051ec715a0db5c48ebcecebfe9d6c63 +Subproject commit da2acfc8266fc771d409a728fa8450a01a042c9c diff --git a/qtxmlpatterns b/qtxmlpatterns index 1fe82f96..47aed17d 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 1fe82f967320b3c65f29ed704862f8c34a6c0c87 +Subproject commit 47aed17df4cde1a8bfb487ce6452b2b3634e2402 From d4e3d3cac32fca1c53576a3841174d6c38165143 Mon Sep 17 00:00:00 2001 From: Tuomas Heimonen Date: Fri, 6 Sep 2019 15:40:15 +0300 Subject: [PATCH 056/105] Saferenderer: Update qtci-linux-RHEL-7.4-x86_64 static build Add build flag '-no-opengl' to remove xcb from static build Add build flag '-no-vulkan' to disable vulkan Task-number: QSR-517 Change-Id: I7d6f5c507bd96aed024d3cf74029feb12ad77bca Reviewed-by: Jukka Jokiniva --- coin/platform_configs/qtsaferenderer.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/qtsaferenderer.yaml b/coin/platform_configs/qtsaferenderer.yaml index ce537865..14e0e953 100644 --- a/coin/platform_configs/qtsaferenderer.yaml +++ b/coin/platform_configs/qtsaferenderer.yaml @@ -11,4 +11,4 @@ Template: 'qtci-linux-RHEL-7.4-x86_64' Compiler: 'GCC' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -static -nomake tests -nomake examples -no-use-gold-linker -no-icu -no-fontconfig -qt-freetype -qpa offscreen -no-xcb -qt-libpng' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -static -nomake tests -nomake examples -no-use-gold-linker -no-icu -no-fontconfig -qt-freetype -no-opengl -qpa offscreen -no-xcb -qt-libpng -no-vulkan' From bbc7794b64a2ad6610e00efb4ea501806af08030 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Mon, 9 Sep 2019 20:40:02 +0200 Subject: [PATCH 057/105] Update submodules on '5.14' in qt5 Change-Id: I98f238f0dbe8cb3537808457b448c7e61ac533a0 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qtserialbus | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qt3d b/qt3d index 114600e0..a79c34fe 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 114600e0a4ad6481d027bb7c4f206aac09a7bc13 +Subproject commit a79c34fe6ef7e47582de9188e284644e9665f31b diff --git a/qtbase b/qtbase index 46ec24d2..228f0c1d 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 46ec24d2b9a0fb1d59955f11dab0ead05dd017f9 +Subproject commit 228f0c1d2e1e4a4b160172dbf254935bb8fa2460 diff --git a/qtdeclarative b/qtdeclarative index f862b3ed..81ac3bd8 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit f862b3edeb8a96a49a5d12620506d33d5a5aadca +Subproject commit 81ac3bd856e7c6ead21fc2efc34cdf52cd9196b1 diff --git a/qtlocation b/qtlocation index d7761951..08972f5e 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit d776195186a53fcfaa5270d139df4b13298fe40b +Subproject commit 08972f5e65c8d7286fe1435cb85be4574ac3772f diff --git a/qtqa b/qtqa index 3cbc0456..cd7003a5 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 3cbc0456a5c238c755e47c49ee4b047836eae5eb +Subproject commit cd7003a5bb8cf022044ee0fe0e10e5e601dbfcf2 diff --git a/qtquick3d b/qtquick3d index cb674f11..28d4f884 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit cb674f118872fdc417df0089268892131462dc6f +Subproject commit 28d4f8841f05d36a8fa81d382dc7a866d841eb4e diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 5b963125..e15a6a37 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 5b9631256f5c4500114981061e9f12104f0c5d82 +Subproject commit e15a6a37d297bb466b96c3baf6073cc971c56ba2 diff --git a/qtserialbus b/qtserialbus index 535615a4..35e03323 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 535615a4dc6430ac4b0512b6705721c75e160b10 +Subproject commit 35e033232f8b19fcd3785baf04fec0db546d8015 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index e342f136..997a4c23 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit e342f1366eff06f3cf01991b377c880b2d246177 +Subproject commit 997a4c23d5c062644eda3b0db74252654289bdc5 diff --git a/qtwayland b/qtwayland index f1148d63..a85e1542 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit f1148d63430347af03827c995bf68f86793c7ae0 +Subproject commit a85e1542de6fcd84de22955c8aa764e8c8317331 diff --git a/qtwebengine b/qtwebengine index 68539693..8daefcfd 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 68539693fe022595b2e4fbecd448b2fca5e7d3e5 +Subproject commit 8daefcfd8e1bf41ae4d06c7a79a526b81a78dc58 diff --git a/qtwebsockets b/qtwebsockets index 597d005c..87a5151a 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 597d005c053503e104755bcb7156c0ab2bedfe15 +Subproject commit 87a5151adfc9947f2ab2e560fea7da0088eb59c6 From 8c00a4f01117a8ca26275450e23364ec3e6270f8 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Wed, 14 Aug 2019 13:12:01 +0200 Subject: [PATCH 058/105] Add webAssembly build for windows again This reverts commit 9a8fb868ec2c526325408a4cbf3e628aa3377e30 partially. See also 38e416be664dc216b332e6b4ff8d38905dfdc1e9. Task-number: QTBUG-63917 Task-number: QTQAINFRA-2835 Change-Id: I6a63c2c437bd1568d88ffae0b565b99c15188770 Reviewed-by: Liang Qi --- coin/platform_configs/qt5.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/coin/platform_configs/qt5.yaml b/coin/platform_configs/qt5.yaml index 95ce332c..f502de7c 100644 --- a/coin/platform_configs/qt5.yaml +++ b/coin/platform_configs/qt5.yaml @@ -156,6 +156,12 @@ Compiler: 'GCC' Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-use-gold-linker -opengl es2 -qpa qnx -xplatform qnx-x86-64-qcc' +- + Template: 'qtci-windows-10-x86_64-14' + Target os: 'WebAssembly' + Compiler: 'Mingw73' + Features: ['Packaging', 'DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake examples -nomake tests -no-feature-thread -static -no-dbus -no-headersclean -no-ssl -no-warnings-are-errors -no-pch -platform win32-g++ -xplatform wasm-emscripten' - Template: 'qtci-macos-10.13-x86_64-2' Target os: 'WebAssembly' From 4909f4a765246a36297fa5d869096541ef84f668 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 9 Sep 2019 20:59:09 +0200 Subject: [PATCH 059/105] Update submodules on '5.13' in qt5 Change-Id: I201b65701b7f9f58422ba1bcdbd42c6278d9e604 Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 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 +- 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 a79b9874..a5b02c4f 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit a79b9874e7b7eb9af765c2460aa3b4e83dfb446e +Subproject commit a5b02c4f78b0bc7d0c48143e83d8d222f153be52 diff --git a/qtactiveqt b/qtactiveqt index e32e8fc9..5075808e 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit e32e8fc9c7aeb3c0326bf370e1a57ce914954500 +Subproject commit 5075808ee2e1a644bb85764367b60a31e5dcae94 diff --git a/qtandroidextras b/qtandroidextras index 231ebc72..6586350b 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit 231ebc725d42ca82d1f1a6eecc47a2bdd39769e8 +Subproject commit 6586350b36a40be682cc351d7963c82c003be82e diff --git a/qtbase b/qtbase index cc32a691..17032c4d 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit cc32a691936f37eaaec618a71edd62f896009c9d +Subproject commit 17032c4d64cc4cf32580ff994e443f16126ad7a3 diff --git a/qtcharts b/qtcharts index 9439312d..73efdb10 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 9439312d27d89b8f6df57a5f24f04b4de2e67642 +Subproject commit 73efdb1066dcf5b4690de44f712f3de4d5f1fc18 diff --git a/qtconnectivity b/qtconnectivity index dd4593c6..c1803d26 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit dd4593c61e4b77c4e3b1ee516a1e8825ebb0197b +Subproject commit c1803d266854c6f71994705133e5b2b93a060d1e diff --git a/qtdatavis3d b/qtdatavis3d index cd09330c..1a58c3cf 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit cd09330ce6304359ded5217ae28d2617144c36a5 +Subproject commit 1a58c3cffe2190f20aca3d7acbb25a9ff62d6770 diff --git a/qtdoc b/qtdoc index bf10f7e7..a6b5232c 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit bf10f7e76139a5d31c59c58b5431f3deb99afcaf +Subproject commit a6b5232ce32b3b019293fbbc8edd0cd8d4e3145c diff --git a/qtgamepad b/qtgamepad index d4a8e16f..572ef46c 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit d4a8e16f573c77eae966e942ecf6c7f95d0d5baa +Subproject commit 572ef46c5fd98e1052211051362e7c48930deacd diff --git a/qtgraphicaleffects b/qtgraphicaleffects index 4d1c22f7..3cac429c 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit 4d1c22f7596a76e0bbac1b1652685247b3ff26ca +Subproject commit 3cac429c9bf0bc43f281aa12cb121bece608cb37 diff --git a/qtimageformats b/qtimageformats index f5c2d74b..cd646ff7 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit f5c2d74b8de61164dc5d0abd21b86a9233ead02f +Subproject commit cd646ff7e1990ddcd5438767fa7093131734c171 diff --git a/qtlocation b/qtlocation index 5a241342..55e127bb 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 5a2413424911dd1491945c3baf341219110f8f2a +Subproject commit 55e127bb430aaea9ebf4c770c9efb228e019af25 diff --git a/qtmacextras b/qtmacextras index b8584e85..7f207d3e 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit b8584e85ab970f18d2697c1146728dbbf7eafdc2 +Subproject commit 7f207d3e31fb768083462ef13a8163ab0a866212 diff --git a/qtmultimedia b/qtmultimedia index d31e5042..cb06ede8 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit d31e5042ed6d8c1bd4dafe980eb90db4fc3e63de +Subproject commit cb06ede8ba9a33adbbfdc690faa1a83be4e70b55 diff --git a/qtnetworkauth b/qtnetworkauth index 6c9e2b87..a2e48c7e 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 6c9e2b87fc8a0e19f6e3da6d877146bd680bca56 +Subproject commit a2e48c7e2a039b7eeeca9d35757e071e8c74605d diff --git a/qtpurchasing b/qtpurchasing index d2da2243..2fa73233 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit d2da22432886b2bd506e547c5f8f8cfa24e55db4 +Subproject commit 2fa7323376c99f6ef51fd22a68704e993a7f486f diff --git a/qtquickcontrols b/qtquickcontrols index 0f7ad499..ac9f2e58 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 0f7ad49951419199d7042bdf91649a50e309059a +Subproject commit ac9f2e582dc6c0f740b8c5b225bc65a8c1b35e9e diff --git a/qtquickcontrols2 b/qtquickcontrols2 index caf39510..933787fb 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit caf39510ea761ebbd719c47e70f5fa88881f0b0b +Subproject commit 933787fb59cbc76301841ae77e51c8bc081e35f3 diff --git a/qtremoteobjects b/qtremoteobjects index 7ec7aa57..b94871ce 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 7ec7aa570f45aba02b7e6f00cf2a92ab4def3387 +Subproject commit b94871ce10d5d319b7a3293cf939b6a072c3be26 diff --git a/qtscript b/qtscript index 0881a7d7..5b75f4ed 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 0881a7d7887c4a78030432d9acee7305bc8960b8 +Subproject commit 5b75f4edd91a99945f04f34f78875d99e9d919bf diff --git a/qtscxml b/qtscxml index 2a5a794e..a57befb1 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 2a5a794e26dfc094323f73383381233c8f00ef3c +Subproject commit a57befb1da4b7386caf634293ab4563ad90c3107 diff --git a/qtsensors b/qtsensors index 11c91568..7191c267 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 11c91568f342b226b8d34268bcf25d118779353d +Subproject commit 7191c267395a079eb6621198c219fc19ab79d3d5 diff --git a/qtserialbus b/qtserialbus index 75e5dd86..e6b042a7 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 75e5dd86266b8b03761d685cb042deaa36415a92 +Subproject commit e6b042a795902226c7d7f1ec576c8e063ef76740 diff --git a/qtserialport b/qtserialport index 8a0f4a01..f6b43c36 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 8a0f4a01a180798cd2c65295f5e1f91c9a3ff88e +Subproject commit f6b43c36b3839dae54308a6437bbdd99ae9a44de diff --git a/qtspeech b/qtspeech index 2783f4e2..9e2f02d8 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 2783f4e2695ef023b3721692080ac0f2ec62a559 +Subproject commit 9e2f02d8c8a05e9fe54cd56934fb00c4c5bd1da1 diff --git a/qtsvg b/qtsvg index 9f8a8f8b..de830ffd 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 9f8a8f8b4c137b1aef0a9873f46a29b5807ed56d +Subproject commit de830ffd455d8a2eb95eba81f86e9a75ed876765 diff --git a/qttools b/qttools index 1a858d32..b0e9c1c5 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 1a858d32fef239bca95b72b8fd2186b30983a2af +Subproject commit b0e9c1c5367ab6da76850139bddab2578fc179cd diff --git a/qttranslations b/qttranslations index 55b11294..ccb71797 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 55b11294296a7bbc3a3bdfe9d2f5b381abf01d92 +Subproject commit ccb71797f2bc8f9ebd55954adc71370beed4165f diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 21e5ab03..57b9af92 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 21e5ab030d2f735560b7ab381dfaf8d468c247ff +Subproject commit 57b9af923b30ff301d60d86cf77fbbf1ab53bbbb diff --git a/qtwayland b/qtwayland index 53ab5e77..92332169 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 53ab5e7748340f922f7f32c7d2db4965aa8c2ff2 +Subproject commit 9233216972fc9823e5824568cbac7c804b1a4481 diff --git a/qtwebchannel b/qtwebchannel index 6995ffbf..e724c01b 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 6995ffbf54cba31e081ed729d9f44aee88d3bb91 +Subproject commit e724c01be4a5abf093d936ec263a51d4dfa3ab18 diff --git a/qtwebglplugin b/qtwebglplugin index 514f8a63..7e9f4028 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit 514f8a63d8e4b915bb8c51248ca811306f267286 +Subproject commit 7e9f4028c5ac856d9a307927528fd4065f8b4ff8 diff --git a/qtwebsockets b/qtwebsockets index e5f1f3d7..81587889 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit e5f1f3d74731416a2acc0f9272dd450f4eabccf6 +Subproject commit 81587889b1563557dd6fdc61dcde2a08445a9243 diff --git a/qtwebview b/qtwebview index 2c6f39f0..b206dd8a 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 2c6f39f051eb40a4ce0421fbcfcd79a094591f24 +Subproject commit b206dd8a3ccff693eed9bdc271351ed613f23fdf diff --git a/qtwinextras b/qtwinextras index 7364f281..fb6d18a1 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 7364f281b54ff12f1f433aa7dc4e257c843f6e12 +Subproject commit fb6d18a116dea6f8f1db61053454ce77c17f0e97 diff --git a/qtx11extras b/qtx11extras index 24ac774e..a5c017a0 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 24ac774e9508fa4e2b9bcd9af70d2cdead820b37 +Subproject commit a5c017a00bcaf4d68a1cb6cc8a937d7af63be09b diff --git a/qtxmlpatterns b/qtxmlpatterns index 68a4f3d6..61f18cc3 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 68a4f3d62bcde501db1592297291a92661346f80 +Subproject commit 61f18cc3619bbdeed47b0e161ff44089a6f82f0e From d8a384f03f928f83cf1799326c46d546cd9bbc7d Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Mon, 9 Sep 2019 12:35:05 +0300 Subject: [PATCH 060/105] Provisioning: Use correct sysroot path for QEMU armv7 in qtdeclarative MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTQAINFRA-2808 Change-Id: Ia0caf7003a5bd67dc220f0a3a1da06646ca6b657 Reviewed-by: Tony Sarajärvi --- coin/platform_configs/qtdeclarative.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/platform_configs/qtdeclarative.yaml b/coin/platform_configs/qtdeclarative.yaml index 2bf9118a..161875d8 100644 --- a/coin/platform_configs/qtdeclarative.yaml +++ b/coin/platform_configs/qtdeclarative.yaml @@ -15,7 +15,7 @@ Target os: 'QEMU' Target arch: 'armv7' Compiler: 'GCC' - Configure arguments: '-opensource -confirm-license -R . -developer-build -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi/usr/bin/mysql_config -no-xcb -nomake examples -nomake tests -openssl -prefix /home/qt/work/install -psql_config /dev/null -sysroot /opt/yocto-armv7/sysroots/armv7ahf-neon-poky-linux-gnueabi -tslib -verbose' + Configure arguments: '-opensource -confirm-license -R . -developer-build -device linux-imx7-g++ -device-option CROSS_COMPILE=/opt/yocto-armv7/sysroots/x86_64-pokysdk-linux/usr/bin/arm-poky-linux-gnueabi/arm-poky-linux-gnueabi- -device-option DISTRO_OPTS="hard-float boot2qt" -extprefix /home/qt/work/install -mysql_config /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi/usr/bin/mysql_config -no-xcb -nomake examples -nomake tests -openssl -prefix /home/qt/work/install -psql_config /dev/null -sysroot /opt/yocto-armv7/sysroots/armv7at2hf-neon-poky-linux-gnueabi -tslib -verbose' - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Target os: 'QEMU' From 7e78bd1efd1cf7abae07f5421496ffac504ebf30 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 10 Sep 2019 13:19:46 +0200 Subject: [PATCH 061/105] Update submodules on '5.14' in qt5 Change-Id: Ifa16f5ec4558b490dd775598b269ef6699cceb91 Reviewed-by: Liang Qi --- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtquick3d | 2 +- qtquicktimeline | 2 +- qttools | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qtbase b/qtbase index 228f0c1d..648dac1c 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 228f0c1d2e1e4a4b160172dbf254935bb8fa2460 +Subproject commit 648dac1ceb40a346adf2081997f5c6166c3ad503 diff --git a/qtconnectivity b/qtconnectivity index a309d04f..10c8985b 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit a309d04fa1edb3fa320d420758b3967616ad792a +Subproject commit 10c8985b9151ea6b4ccfc7bbfb996af1001612ef diff --git a/qtdeclarative b/qtdeclarative index 81ac3bd8..8cfd5fde 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 81ac3bd856e7c6ead21fc2efc34cdf52cd9196b1 +Subproject commit 8cfd5fde29e5a6469d164bcc29eb3d0a0aa191cf diff --git a/qtquick3d b/qtquick3d index 28d4f884..66d193e9 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 28d4f8841f05d36a8fa81d382dc7a866d841eb4e +Subproject commit 66d193e938f6eda278ccee892d37c1ea82dcdad2 diff --git a/qtquicktimeline b/qtquicktimeline index 15de8ac5..18bd2a9f 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 15de8ac5c06a0afcd8676f976254b3aeeebac586 +Subproject commit 18bd2a9fbb38d3357aa0bfece163c80e88d83258 diff --git a/qttools b/qttools index 2174b1a3..112147de 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 2174b1a34a0754376b77528161bf2328855cb0e7 +Subproject commit 112147de44d2ecd9b4cb33f6601f8aa29638ee37 From bcdfcd266864a92719add4d76ad868659623f5cd Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 10 Sep 2019 22:12:13 +0200 Subject: [PATCH 062/105] Update submodules on '5.13' in qt5 Change-Id: Id18e857d3312854344f5ffa01cf7666107803a0b Reviewed-by: Liang Qi --- qtbase | 2 +- qtmultimedia | 2 +- qtquickcontrols2 | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qtbase b/qtbase index 17032c4d..e5e8f1d6 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 17032c4d64cc4cf32580ff994e443f16126ad7a3 +Subproject commit e5e8f1d67ce5f74ccb345086667933266543fd51 diff --git a/qtmultimedia b/qtmultimedia index cb06ede8..a1bf811b 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit cb06ede8ba9a33adbbfdc690faa1a83be4e70b55 +Subproject commit a1bf811b1dd287fbb75b6d27dbc163f15001e28f diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 933787fb..1fec9705 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 933787fb59cbc76301841ae77e51c8bc081e35f3 +Subproject commit 1fec97053884d998442710a5d4258ffb6bed8955 diff --git a/qtwayland b/qtwayland index 92332169..813365f4 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 9233216972fc9823e5824568cbac7c804b1a4481 +Subproject commit 813365f472cf3b955d0985f83d0169016806cc36 diff --git a/qtwebengine b/qtwebengine index 15f34fb4..2f720836 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 15f34fb479567dc728fedf3ab2d13a86bf421c59 +Subproject commit 2f72083601fb6a4fcc66b6440222291fc334cb3f From 39a9e58888b19d4ad6e821b2498d85121b283c6c Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 11 Sep 2019 20:39:45 +0200 Subject: [PATCH 063/105] Update submodules on '5.13' in qt5 Change-Id: I07251a5915fb85153fb81d05dc16c7ed8eba5dcf Reviewed-by: Liang Qi --- qtbase | 2 +- qtdoc | 2 +- qtmultimedia | 2 +- qtquickcontrols2 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qtbase b/qtbase index e5e8f1d6..bc34784d 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit e5e8f1d67ce5f74ccb345086667933266543fd51 +Subproject commit bc34784d053ebf9b0d167e9398052fcc80d8af87 diff --git a/qtdoc b/qtdoc index a6b5232c..2d933241 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit a6b5232ce32b3b019293fbbc8edd0cd8d4e3145c +Subproject commit 2d9332410e4353e463c3e492bf4364396e45168d diff --git a/qtmultimedia b/qtmultimedia index a1bf811b..81e87e34 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit a1bf811b1dd287fbb75b6d27dbc163f15001e28f +Subproject commit 81e87e34c444404c79a7365e490607c35dc0c661 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 1fec9705..c18c7bd7 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 1fec97053884d998442710a5d4258ffb6bed8955 +Subproject commit c18c7bd7f9596e5ad3d13876a91203e1ceba2544 From 6762ccb18664aee9e50b05a9d49042477405b9bb Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 11 Sep 2019 20:35:24 +0200 Subject: [PATCH 064/105] Update submodules on '5.14' in qt5 Change-Id: Ib6d7eb8b580702724369ac7c81df16688b2b87ec Reviewed-by: Liang Qi --- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtmultimedia | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qtserialbus | 2 +- qttools | 2 +- qtwebchannel | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/qtbase b/qtbase index 648dac1c..78437ef0 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 648dac1ceb40a346adf2081997f5c6166c3ad503 +Subproject commit 78437ef0d2d662663bbc827befc849cad5886b63 diff --git a/qtconnectivity b/qtconnectivity index 10c8985b..2c6dcc64 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 10c8985b9151ea6b4ccfc7bbfb996af1001612ef +Subproject commit 2c6dcc643f29c212fca0ead123a377e96b9a17c9 diff --git a/qtdeclarative b/qtdeclarative index 8cfd5fde..1bb96cfc 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 8cfd5fde29e5a6469d164bcc29eb3d0a0aa191cf +Subproject commit 1bb96cfcce47152c578bcc9a7c2ad80b0f0e6553 diff --git a/qtdoc b/qtdoc index e97ff5ea..b490a202 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit e97ff5ea10f780fa44ec2481a6fb71a91cdac06e +Subproject commit b490a2028f4c03783e76646bf9ff47e3601bf14d diff --git a/qtmultimedia b/qtmultimedia index b2a5fc61..c9058d90 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit b2a5fc61ad374503ace4c96c68fbfc5a6670b8fa +Subproject commit c9058d90d0b08781f14a494780c3094594c81f22 diff --git a/qtquick3d b/qtquick3d index 66d193e9..f34be375 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 66d193e938f6eda278ccee892d37c1ea82dcdad2 +Subproject commit f34be375adbaadd2232d97a3743680e32e7b5498 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index e15a6a37..e0b2a303 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit e15a6a37d297bb466b96c3baf6073cc971c56ba2 +Subproject commit e0b2a30357a6fbb2d52fcba69f0a5059d3b065b8 diff --git a/qtserialbus b/qtserialbus index 35e03323..47eaa2b1 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 35e033232f8b19fcd3785baf04fec0db546d8015 +Subproject commit 47eaa2b1a58db67643f32cb1d8779c5b199ccb10 diff --git a/qttools b/qttools index 112147de..01d70a31 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 112147de44d2ecd9b4cb33f6601f8aa29638ee37 +Subproject commit 01d70a3150191445b043873db2a19474983a411e diff --git a/qtwebchannel b/qtwebchannel index 29496e3f..744a7330 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 29496e3f08e20398e253e6d32bb95879a1a68978 +Subproject commit 744a7330f786259bd48e442da391d11ab12d62c7 From fa03dbce1f1eff1967d6607e1c41c8fc41cc0a09 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Mon, 19 Aug 2019 14:48:31 +0300 Subject: [PATCH 065/105] Platform configurations: Move Android_ANY (clang-x86) to default MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Arm targets from default change places with clang-x86 from qt5 Task-number: QTQAINFRA-3153 Change-Id: I642f5c07fd5c36bf675676d82f5f200bce4beccf Reviewed-by: Tony Sarajärvi --- coin/platform_configs/default.yaml | 20 ++++++++++++++------ coin/platform_configs/qt5.yaml | 30 +++++++++++------------------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 4ac899de..55e73038 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -40,6 +40,14 @@ Configurations: Compiler: 'MSVC2017' Features: ['Packaging'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64%' +- + Template: 'qtci-windows-10-x86_64-14' + Target os: 'Android_ANY' + Target arch: 'x86' + Compiler: 'Mingw73' + Target compiler: 'Clang' + Features: ['Packaging', 'DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -android-arch x86' - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Compiler: 'GCC' @@ -130,21 +138,21 @@ Configurations: Features: ['DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -xplatform macx-watchos-clang' - - Template: 'qtci-linux-RHEL-7.6-x86_64' + Template: 'qtci-macos-10.13-x86_64-2' Target os: 'Android_ANY' - Target arch: 'armv7' + Target arch: 'x86' Compiler: 'Clang' Target compiler: 'Clang' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -no-use-gold-linker -sysconfdir /etc/xdg -opengl es2 -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch armeabi-v7a -xplatform android-clang' + Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host darwin-x86_64 -android-arch x86' - Template: 'qtci-linux-RHEL-7.6-x86_64' Target os: 'Android_ANY' - Target arch: 'arm64' - Compiler: 'Clang' + Target arch: 'x86' + Compiler: 'GCC' Target compiler: 'Clang' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -no-use-gold-linker -sysconfdir /etc/xdg -opengl es2 -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch arm64-v8a -xplatform android-clang' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-use-gold-linker -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch x86' - Template: 'qtci-linux-Ubuntu-18.04-x86_64' Target os: 'QEMU' diff --git a/coin/platform_configs/qt5.yaml b/coin/platform_configs/qt5.yaml index 69f1c7e3..49116bd3 100644 --- a/coin/platform_configs/qt5.yaml +++ b/coin/platform_configs/qt5.yaml @@ -37,11 +37,19 @@ - Template: 'qtci-linux-RHEL-7.6-x86_64' Target os: 'Android_ANY' - Target arch: 'x86' - Compiler: 'GCC' + Target arch: 'armv7' + Compiler: 'Clang' Target compiler: 'Clang' Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-use-gold-linker -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch x86' + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -no-use-gold-linker -sysconfdir /etc/xdg -opengl es2 -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch armeabi-v7a -xplatform android-clang' +- + Template: 'qtci-linux-RHEL-7.6-x86_64' + Target os: 'Android_ANY' + Target arch: 'arm64' + Compiler: 'Clang' + Target compiler: 'Clang' + Features: ['Packaging', 'DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -no-use-gold-linker -sysconfdir /etc/xdg -opengl es2 -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host linux-x86_64 -android-arch arm64-v8a -xplatform android-clang' - Template: 'qtci-windows-10-x86_64-14' Target os: 'Android_ANY' @@ -58,14 +66,6 @@ Target compiler: 'Clang' Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -android-arch arm64-v8a' -- - Template: 'qtci-windows-10-x86_64-14' - Target os: 'Android_ANY' - Target arch: 'x86' - Compiler: 'Mingw73' - Target compiler: 'Clang' - Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r19c -android-arch x86' - Template: 'qtci-macos-10.13-x86_64-2' Target os: 'Android_ANY' @@ -82,14 +82,6 @@ Target compiler: 'Clang' Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host darwin-x86_64 -android-arch arm64-v8a' -- - Template: 'qtci-macos-10.13-x86_64-2' - Target os: 'Android_ANY' - Target arch: 'x86' - Compiler: 'Clang' - Target compiler: 'Clang' - Features: ['Packaging', 'DisableTests'] - Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r19c -android-ndk-host darwin-x86_64 -android-arch x86' - Template: 'qtci-macos-10.13-x86_64-2' Target os: 'QNX_700' From b83b16277d1758c868779f931934deca7b4390b0 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 12 Sep 2019 23:31:14 +0200 Subject: [PATCH 066/105] Update submodules on '5.13' in qt/qt5 Change-Id: Icc4380912fc6d1cbb35b2282c37a180641186f60 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtquickcontrols2 | 2 +- qttools | 2 +- qtwebengine | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qtbase b/qtbase index bc34784d..447ee95d 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit bc34784d053ebf9b0d167e9398052fcc80d8af87 +Subproject commit 447ee95d5e050c5db1636c5d3bd0edbf59f26108 diff --git a/qtdeclarative b/qtdeclarative index f19ec456..69f62dc8 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit f19ec4561b4975d68290593b599d3c38d0f9f6d3 +Subproject commit 69f62dc8efc738dff1fac50f8a6d8b2b09e654cf diff --git a/qtdoc b/qtdoc index 2d933241..1715eeed 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 2d9332410e4353e463c3e492bf4364396e45168d +Subproject commit 1715eeed9972fbe2b72562e7bc1015695927bf7c diff --git a/qtquickcontrols2 b/qtquickcontrols2 index c18c7bd7..a5be4ae5 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit c18c7bd7f9596e5ad3d13876a91203e1ceba2544 +Subproject commit a5be4ae50c40f938ca8660296362fc06cc8273b1 diff --git a/qttools b/qttools index b0e9c1c5..5cfa917b 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit b0e9c1c5367ab6da76850139bddab2578fc179cd +Subproject commit 5cfa917baf416f6234bd99e51f05514b1859e2fe diff --git a/qtwebengine b/qtwebengine index 2f720836..c795c96e 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 2f72083601fb6a4fcc66b6440222291fc334cb3f +Subproject commit c795c96eaa740d6743293af8c6b01bcc58cec64a From e62df66baccfe1e3f38b8a6afa325f9cb30b4030 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Mon, 16 Sep 2019 14:29:04 +0200 Subject: [PATCH 067/105] Update submodules on '5.14' in qt/qt5 Change-Id: Ic4dacbe6f7f964d10b1cd5569ddf933c0f638126 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtmultimedia | 2 +- qtquick3d | 2 +- qtwayland | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qt3d b/qt3d index a79c34fe..7814da64 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit a79c34fe6ef7e47582de9188e284644e9665f31b +Subproject commit 7814da64942c4566e2fa9c9e2bd2a1e169e7fab9 diff --git a/qtbase b/qtbase index 78437ef0..08ad9640 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 78437ef0d2d662663bbc827befc849cad5886b63 +Subproject commit 08ad96404b4c915eece1a547bf12e91664e7cdff diff --git a/qtdeclarative b/qtdeclarative index 1bb96cfc..90a706df 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 1bb96cfcce47152c578bcc9a7c2ad80b0f0e6553 +Subproject commit 90a706dffb944e7d18b8b199b1cea68633e2b172 diff --git a/qtmultimedia b/qtmultimedia index c9058d90..38e49d06 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit c9058d90d0b08781f14a494780c3094594c81f22 +Subproject commit 38e49d060d13ef592f457a5d6640d68a2d9c6b06 diff --git a/qtquick3d b/qtquick3d index f34be375..fa5d0b45 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit f34be375adbaadd2232d97a3743680e32e7b5498 +Subproject commit fa5d0b457c5e31cea5a1bddad574d4505c93174f diff --git a/qtwayland b/qtwayland index a85e1542..7da25445 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit a85e1542de6fcd84de22955c8aa764e8c8317331 +Subproject commit 7da254456001193f93100070e229fc6cffc92495 From a3136bdbfef242339c002630f51b4bc0f5c05503 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 3 Sep 2019 12:46:29 +0300 Subject: [PATCH 068/105] Provisioning: Disable or delete unneeded tasks and services MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Windows have lot's of tasks and services running which are slowing the performance of build machine. Also 'windows' and 'windows defender' updates need's to be "permanently" disabled. Task-number: QTQAINFRA-3182 Change-Id: I8f6b237fcdc6e38fa9a06836d349821d86c58afc Reviewed-by: Tony Sarajärvi --- .../common/windows/disable-schedule-tasks.ps1 | 88 +++++++++++++++++++ .../windows/disable-update-orchestrator.ps1 | 16 ++++ .../common/windows/disable-windefender.ps1 | 51 +++++++++++ .../disable-windows-file-protector.ps1 | 4 + .../disable-windows-module-installer.ps1 | 4 + .../windows/disable-windows-update-medic.ps1 | 25 ++++++ coin/provisioning/common/windows/helpers.ps1 | 20 +++++ .../98-disable-file-protector.ps1 | 1 + .../98-disable-schedule-tasks.ps1 | 1 + .../98-disable-update-orchestrator.ps1 | 1 + .../98-disable-windows-module-installer.ps1 | 1 + .../98-disable-windows-update-medic.ps1 | 2 + 12 files changed, 214 insertions(+) create mode 100644 coin/provisioning/common/windows/disable-schedule-tasks.ps1 create mode 100644 coin/provisioning/common/windows/disable-update-orchestrator.ps1 create mode 100644 coin/provisioning/common/windows/disable-windows-file-protector.ps1 create mode 100644 coin/provisioning/common/windows/disable-windows-module-installer.ps1 create mode 100644 coin/provisioning/common/windows/disable-windows-update-medic.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/98-disable-file-protector.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/98-disable-schedule-tasks.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/98-disable-update-orchestrator.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/98-disable-windows-module-installer.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/98-disable-windows-update-medic.ps1 diff --git a/coin/provisioning/common/windows/disable-schedule-tasks.ps1 b/coin/provisioning/common/windows/disable-schedule-tasks.ps1 new file mode 100644 index 00000000..351f10c6 --- /dev/null +++ b/coin/provisioning/common/windows/disable-schedule-tasks.ps1 @@ -0,0 +1,88 @@ +. "$PSScriptRoot\helpers.ps1" + +# This script will remove unneeded Tasks from Task Scheduler + +# Application Experience 'Microsoft Compatibility Appraiser' - "Collects program telemetry information if opted-in to the Microsoft Customer Experience Improvement Program." +DisableSchedulerTask "Application Experience\Microsoft Compatibility Appraiser" + +# Application Experience 'ProgramDataUpdater' - "Collects program telemetry information if opted-in to the Microsoft Customer Experience Improvement Program" +DisableSchedulerTask "Application Experience\ProgramDataUpdater" + +# Autochk 'Proxy' - "This task collects and uploads autochk SQM data if opted-in to the Microsoft Customer Experience Improvement Program." +DisableSchedulerTask "Autochk\Proxy" + +# Chkdsk 'ProactiveScan' - "NTFS Volume Health Scan" +DisableSchedulerTask "Chkdsk\ProactiveScan" + +# Chkdsk 'SyspartRepair' +DeleteSchedulerTask "Chkdsk\SyspartRepair" + +# Customer Experience Improvement Program 'Consolidator' - "If the user has consented to participate in the Windows Customer Experience Improvement Program, this job collects and sends usage data to Microsoft." +DisableSchedulerTask "Customer Experience Improvement Program\Consolidator" + +# Customer Experience Improvement Program 'sbCeip' - "The USB CEIP (Customer Experience Improvement Program) task collects Universal Serial Bus related statistics and information about your machine and sends it to the Windows Device Connectivity engineering group at Microsoft. The information received is used to help improve the reliability, stability, and overall functionality of USB in Windows. If the user has not consented to participate in Windows CEIP, this task does not do anything." +DisableSchedulerTask "Customer Experience Improvement Program\UsbCeip" + +# Device Information 'Device' +DisableSchedulerTask "Device Information\Device" + +# Diagnosis 'Scheduled' - "The Windows Scheduled Maintenance Task performs periodic maintenance of the computer system by fixing problems automatically or reporting them through Security and Maintenance." +DisableSchedulerTask "Diagnosis\Scheduled" + +# DiskDiagnostic 'Microsoft-Windows-DiskDiagnosticDataCollector' - "The Windows Disk Diagnostic reports general disk and system information to Microsoft for users participating in the Customer Experience Program." +DisableSchedulerTask "DiskDiagnostic\Microsoft-Windows-DiskDiagnosticDataCollector" + +# ExploitGuard 'ExploitGuard MDM policy Refresh' - "Task for applying changes to the machine's Exploit Protection settings." +DisableSchedulerTask "ExploitGuard\ExploitGuard MDM policy Refresh" + +# Feedback/Siuf 'DmClient' +DisableSchedulerTask "Feedback\Siuf\DmClient" + +# Feedback/Siuf 'DmClient'OnScenarioDownload' +DisableSchedulerTask "Feedback\Siuf\DmClientOnScenarioDownload" + +# File Classification Infrastructure 'Property Definition Sync' +DisableSchedulerTask "File Classification Infrastructure\Property Definition Sync" + +# InstallService 'ScanForUpdates' +DisableSchedulerTask "InstallService\ScanForUpdates" + +# InstallService 'ScanForUpdatesAsUser' +DisableSchedulerTask "InstallService\ScanForUpdatesAsUser" + +# LanguageComponentsInstaller 'Installation' - "Install language components that match the user's language list." +DisableSchedulerTask "LanguageComponentsInstaller\Installation" + +# LanguageComponentsInstaller 'ReconcileLanguageResources' - "Install language components that match the user's language list." +DisableSchedulerTask "LanguageComponentsInstaller\ReconcileLanguageResources" + +# PI 'Secure-Boot-Update' - "This task updates the Secure Boot variables." +DisableSchedulerTask "PI\Secure-Boot-Update" + +# PI 'Sqm-Tasks' - "This task gathers information about the Trusted Platform Module (TPM), Secure Boot, and Measured Boot." +DisableSchedulerTask "PI\Sqm-Tasks" + +# Power Efficiency Diagnotics 'AnalyzeSystem' - "This task analyzes the system looking for conditions that may cause high energy use." +DisableSchedulerTask "PushToInstall\Registration" + +# Servicing 'StartComponentCleanup' +DisableSchedulerTask "Servicing\StartComponentCleanup" + +# SettingSync 'BackgroundUploadTask' +DeleteSchedulerTask "SettingSync\BackgroundUploadTask" + +# SoftwareProtectionPlatform 'SvcRestartTask' - "This task restarts the Software Protection Platform service at the specified time" +DeleteSchedulerTask "SoftwareProtectionPlatform\SvcRestartTask" + +# SoftwareProtectionPlatform 'SvcRestartTaskLogon' - "This task restarts the Software Protection Platform service at the specified time" +DisableSchedulerTask "SoftwareProtectionPlatform\SvcRestartTaskLogon" + +# SoftwareProtectionPlatform 'SvcRestartTaskNetwork' - "This task restarts the Software Protection Platform service when a new network is detected" +DisableSchedulerTask "SoftwareProtectionPlatform\SvcRestartTaskNetwork" + +# UNP 'RunUpdateNotificationMgr' +DeleteSchedulerTask "UNP\RunUpdateNotificationMgr" + + + + diff --git a/coin/provisioning/common/windows/disable-update-orchestrator.ps1 b/coin/provisioning/common/windows/disable-update-orchestrator.ps1 new file mode 100644 index 00000000..5ae8fb0d --- /dev/null +++ b/coin/provisioning/common/windows/disable-update-orchestrator.ps1 @@ -0,0 +1,16 @@ +# Disable UpdateOrchestrator + +$name = "UpdateOrchestrator" +$path = "C:\Windows\System32\Tasks\Microsoft\Windows\$name" + +takeown /F $path /A /R +icacls $path /grant Administrators:F /T +SCHTASKS /Change /TN "Microsoft\Windows\$name\Reboot" /DISABLE +del "$path\Schedule Scan" +del "$path\Schedule Scan Static Task" +del "$path\Backup Scan" +del "$path\UpdateModelTask" +del "$path\USO_UxBroker" + +# Disable Update orchestrator service +reg.exe ADD "HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services\UsoSvc" /V Start /T REG_dWORD /D 4 /F diff --git a/coin/provisioning/common/windows/disable-windefender.ps1 b/coin/provisioning/common/windows/disable-windefender.ps1 index e508641e..02ed54da 100644 --- a/coin/provisioning/common/windows/disable-windefender.ps1 +++ b/coin/provisioning/common/windows/disable-windefender.ps1 @@ -1,3 +1,36 @@ +########################################################################### +## +## Copyright (C) 2019 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$ +## +############################################################################# + # Turning off win defender. # # If disabled manually, windows will automatically enable it after @@ -6,3 +39,21 @@ . "$PSScriptRoot\helpers.ps1" Run-Executable "reg.exe" "ADD `"HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows Defender`" /V DisableAntiSpyware /T REG_dWORD /D 1 /F" + +# 'Windows Defender Cache Maintenance' - "Periodic maintenance task." +DisableSchedulerTask "Windows Defender\Windows Defender Cache Maintenance" + +# 'Windows Defender Cleanup' - "Periodic cleanup task." +DisableSchedulerTask "Windows Defender\Windows Defender Cleanup" + +# 'Windows Defender Scheduled Scan' - "Periodic scan task." +DisableSchedulerTask "Windows Defender\Windows Defender Scheduled Scan" + +# 'Windows Defender Verification' - "Periodic verification task." +DisableSchedulerTask "Windows Defender\Windows Defender Verification" + +# Disable 'QueueReporting' - "Windows Error Reporting task to process queued reports." +DisableSchedulerTask "Windows Error Reporting\QueueReporting" + +# Disable WindowsUpdate from Task Scheduler +DisableSchedulerTask "WindowsUpdate\Scheduled Start" diff --git a/coin/provisioning/common/windows/disable-windows-file-protector.ps1 b/coin/provisioning/common/windows/disable-windows-file-protector.ps1 new file mode 100644 index 00000000..f1d09fb5 --- /dev/null +++ b/coin/provisioning/common/windows/disable-windows-file-protector.ps1 @@ -0,0 +1,4 @@ +# Disable Windows File Protection +# Windows File Protection feature in Microsoft Windows prevents programs from replacing critical Windows system files. + +reg.exe ADD "HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon" /V SFCDisable /T REG_dWORD /D 0xffffff9d /F diff --git a/coin/provisioning/common/windows/disable-windows-module-installer.ps1 b/coin/provisioning/common/windows/disable-windows-module-installer.ps1 new file mode 100644 index 00000000..c7f85ff7 --- /dev/null +++ b/coin/provisioning/common/windows/disable-windows-module-installer.ps1 @@ -0,0 +1,4 @@ +# Disable Windows Module Installer (Trusted Installer). +# Trusted Installe enables installation, modification, and removal of Windows updates and optional components. +# If this service is disabled, install or uninstall of Windows updates might fail for this computer. +sc.exe config TrustedInstaller start=disabled diff --git a/coin/provisioning/common/windows/disable-windows-update-medic.ps1 b/coin/provisioning/common/windows/disable-windows-update-medic.ps1 new file mode 100644 index 00000000..6accbd3b --- /dev/null +++ b/coin/provisioning/common/windows/disable-windows-update-medic.ps1 @@ -0,0 +1,25 @@ +# Windows Update Medic Service (WaaSMedicSvc)'PerformRemediation' helps recover update-related services to the supported configuration. +# WaasMedicSvc keeps re-starting Windows Update, even if it disabled manually. +# Even Admin user don't have privileged to disable PerformRemediation from Task Scheduler which means that WaaSMedicSvc.dll need's to be removed from the system + +$limit = (Get-Date).AddMinutes(20) +$path = "C:\Windows\System32\WaaSMedicSvc.dll" + +DO { + takeown /F $path + icacls $path /grant Administrators:f + Write-host "Deleting $path" + + Try { + del $path + } + Catch [System.UnauthorizedAccessException] { + Write-host "Access to the path '$path' is denied." + Continue + } + + if ((Get-Date) -gt $limit) { + exit 1 + } + +}while (Test-Path -Path "$path") diff --git a/coin/provisioning/common/windows/helpers.ps1 b/coin/provisioning/common/windows/helpers.ps1 index ba35f6b5..0f39beed 100644 --- a/coin/provisioning/common/windows/helpers.ps1 +++ b/coin/provisioning/common/windows/helpers.ps1 @@ -222,3 +222,23 @@ function Remove { } } } + +function DisableSchedulerTask { + + Param ( + [string]$Task = $(BadParam("a task")) + ) + + Write-Host "Disabling $Task from Task Scheduler" + SCHTASKS /Change /TN "Microsoft\Windows\$Task" /DISABLE +} + +function DeleteSchedulerTask { + + Param ( + [string]$Task = $(BadParam("a task")) + ) + + Write-Host "Disabling $Task from Task Scheduler" + SCHTASKS /DELETE /TN "Microsoft\Windows\$Task" /F +} diff --git a/coin/provisioning/qtci-windows-10-x86_64/98-disable-file-protector.ps1 b/coin/provisioning/qtci-windows-10-x86_64/98-disable-file-protector.ps1 new file mode 100644 index 00000000..79802f24 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/98-disable-file-protector.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-windows-file-protector.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/98-disable-schedule-tasks.ps1 b/coin/provisioning/qtci-windows-10-x86_64/98-disable-schedule-tasks.ps1 new file mode 100644 index 00000000..9134a735 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/98-disable-schedule-tasks.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-schedule-tasks.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/98-disable-update-orchestrator.ps1 b/coin/provisioning/qtci-windows-10-x86_64/98-disable-update-orchestrator.ps1 new file mode 100644 index 00000000..67dcce60 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/98-disable-update-orchestrator.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-update-orchestrator.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/98-disable-windows-module-installer.ps1 b/coin/provisioning/qtci-windows-10-x86_64/98-disable-windows-module-installer.ps1 new file mode 100644 index 00000000..fb8ec541 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/98-disable-windows-module-installer.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\disable-windows-module-installer.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/98-disable-windows-update-medic.ps1 b/coin/provisioning/qtci-windows-10-x86_64/98-disable-windows-update-medic.ps1 new file mode 100644 index 00000000..7a6ab935 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/98-disable-windows-update-medic.ps1 @@ -0,0 +1,2 @@ +. "$PSScriptRoot\..\common\windows\disable-windows-update-medic.ps1" + From 0cf3fdabe315d62066a7642787a5058a737a79e4 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Thu, 1 Aug 2019 14:51:40 +0300 Subject: [PATCH 069/105] Provisioning: Upgrade Python pip version for Windows machines Task-number: QTQAINFRA-2564 Change-Id: I10402bb3169b483c71e44db7ecba443eb4f46dc1 Reviewed-by: Liang Qi --- coin/provisioning/common/windows/python.ps1 | 5 ++++- coin/provisioning/common/windows/python3.ps1 | 6 +++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/common/windows/python.ps1 b/coin/provisioning/common/windows/python.ps1 index aee4c199..342358d5 100644 --- a/coin/provisioning/common/windows/python.ps1 +++ b/coin/provisioning/common/windows/python.ps1 @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2016 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -75,6 +75,9 @@ if (($archVer -eq 32) -And (Is64BitWinHost)) { Run-Executable "$targetDir\python.exe" "-m ensurepip" +Write-Host "Upgrade pip to the latest version available." +Run-Executable "$targetDir\python.exe" "-m pip install --upgrade pip" + # Install python virtual env if (IsProxyEnabled) { $proxy = Get-Proxy diff --git a/coin/provisioning/common/windows/python3.ps1 b/coin/provisioning/common/windows/python3.ps1 index c05c022c..8fbd615c 100644 --- a/coin/provisioning/common/windows/python3.ps1 +++ b/coin/provisioning/common/windows/python3.ps1 @@ -1,6 +1,6 @@ ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Copyright (C) 2017 Pelagicore AG ## Contact: http://www.qt.io/licensing/ ## @@ -79,6 +79,10 @@ if (IsProxyEnabled) { Write-Host "Using proxy ($proxy) with pip" $pip_args = "--proxy=$proxy" } + +Write-Host "Upgrade pip3 to the latest version available." +Run-Executable "$install_path\python.exe" "-m pip install --upgrade pip" + Run-Executable "$install_path\Scripts\pip3.exe" "$pip_args install virtualenv wheel" # Install all needed packages in a special wheel cache directory From ddc99482eb10a090b61aaf1e7373c5953a664a5b Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Mon, 16 Sep 2019 08:59:07 +0300 Subject: [PATCH 070/105] Cherry-pick a QEMU fix for "core dumped" during tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Task-number: QTBUG-63152 Change-Id: Iac803ca67537eeb9085fb87625103fdde0bfd904 Reviewed-by: Tony Sarajärvi --- coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-qemu.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-qemu.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-qemu.sh index 9a4558e2..3006af47 100755 --- a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-qemu.sh +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/03-qemu.sh @@ -48,6 +48,7 @@ cd "$tempDir" git checkout c7f1cf01b8245762ca5864e835d84f6677ae8b1f git cherry-pick 75e5b70e6b5dcc4f2219992d7cffa462aa406af0 git cherry-pick 04b33e21866412689f18b7ad6daf0a54d8f959a7 +git cherry-pick cd8133679f7e0e2c292f631f1c78b2452d2435c7 git submodule update --init pixman patch -p1 < Date: Tue, 17 Sep 2019 14:47:01 +0200 Subject: [PATCH 071/105] Update submodules on '5.13' in qt/qt5 Change-Id: I42016698eb34b06de2ef9ee268b4b59e9af38f54 Reviewed-by: Qt Submodule Update Bot --- qtdeclarative | 2 +- qtdoc | 2 +- qtnetworkauth | 2 +- qtquickcontrols2 | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qtdeclarative b/qtdeclarative index 69f62dc8..9d89f901 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 69f62dc8efc738dff1fac50f8a6d8b2b09e654cf +Subproject commit 9d89f9019ecd17d21fa491b55726d60985756a29 diff --git a/qtdoc b/qtdoc index 1715eeed..530a73a8 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 1715eeed9972fbe2b72562e7bc1015695927bf7c +Subproject commit 530a73a82518543e1432cf439dda5e0305e1224b diff --git a/qtnetworkauth b/qtnetworkauth index a2e48c7e..202c7d89 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit a2e48c7e2a039b7eeeca9d35757e071e8c74605d +Subproject commit 202c7d893f14e65fbb89e9cf7b37a3502bf923ec diff --git a/qtquickcontrols2 b/qtquickcontrols2 index a5be4ae5..d41362ed 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit a5be4ae50c40f938ca8660296362fc06cc8273b1 +Subproject commit d41362ed752031fdd798e4838b3a56fbb2717f3f diff --git a/qtwayland b/qtwayland index 813365f4..382e3292 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 813365f472cf3b955d0985f83d0169016806cc36 +Subproject commit 382e3292aa0eb6addac84ddefeedc98c7f3b41b2 diff --git a/qtwebengine b/qtwebengine index c795c96e..891a1ee6 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit c795c96eaa740d6743293af8c6b01bcc58cec64a +Subproject commit 891a1ee6d0e894e49cc79efbdf864dd2fded5501 diff --git a/qtwebsockets b/qtwebsockets index 81587889..24a9e0f9 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 81587889b1563557dd6fdc61dcde2a08445a9243 +Subproject commit 24a9e0f961d84af037999771948d3d3d9c683a6c From 5d3b2413d0f108ed8e19f2cd871ed0efd099f83f Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 19 Sep 2019 21:18:07 +0200 Subject: [PATCH 072/105] Update submodules on '5.13' in qt/qt5 Change-Id: Id1259c1907605ad33cbe7f3be3041b26c01f3387 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquickcontrols2 | 2 +- qtrepotools | 2 +- qtsensors | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/qt3d b/qt3d index a5b02c4f..7b7d3cbb 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit a5b02c4f78b0bc7d0c48143e83d8d222f153be52 +Subproject commit 7b7d3cbb23eab884577f2341deb25bdd36c4cae6 diff --git a/qtbase b/qtbase index 447ee95d..0d9f43d5 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 447ee95d5e050c5db1636c5d3bd0edbf59f26108 +Subproject commit 0d9f43d534983411e37a9f3912de272a4a6ced64 diff --git a/qtdeclarative b/qtdeclarative index 9d89f901..5e96f43f 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 9d89f9019ecd17d21fa491b55726d60985756a29 +Subproject commit 5e96f43fe03e16d7ca68f0dd888c4518a98694f2 diff --git a/qtdoc b/qtdoc index 530a73a8..d952a1c0 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 530a73a82518543e1432cf439dda5e0305e1224b +Subproject commit d952a1c09db2d5faf3de6c2b1e5218b26246e6d2 diff --git a/qtmultimedia b/qtmultimedia index 81e87e34..43cd99e6 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 81e87e34c444404c79a7365e490607c35dc0c661 +Subproject commit 43cd99e688860112aa0dce06e1adb7bde4a06edc diff --git a/qtqa b/qtqa index cd7003a5..1652766d 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit cd7003a5bb8cf022044ee0fe0e10e5e601dbfcf2 +Subproject commit 1652766da458448756d08e4a09dee1b16700c473 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index d41362ed..6815f353 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit d41362ed752031fdd798e4838b3a56fbb2717f3f +Subproject commit 6815f353e5a73c0dcf39fbfc91c6a2c1b0784324 diff --git a/qtrepotools b/qtrepotools index 37df2fd6..3b937032 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 37df2fd634feac3458c19b8a37a44a36f8e3a72f +Subproject commit 3b937032f51c75b3f517e02b1db670884a8dc103 diff --git a/qtsensors b/qtsensors index 7191c267..220ab35b 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 7191c267395a079eb6621198c219fc19ab79d3d5 +Subproject commit 220ab35bfd864cb390e9051b9563587319f58bd4 diff --git a/qtwayland b/qtwayland index 382e3292..7e658cf2 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 382e3292aa0eb6addac84ddefeedc98c7f3b41b2 +Subproject commit 7e658cf26dc6e85dbe4a4216f7294dbb3a928dcc diff --git a/qtwebengine b/qtwebengine index 891a1ee6..d8fe250e 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 891a1ee6d0e894e49cc79efbdf864dd2fded5501 +Subproject commit d8fe250e542519012247952a034e78b0d492b730 From a4ca20dfce21e68d7b79c8736563705f78d78f23 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 21 Sep 2019 23:31:01 +0200 Subject: [PATCH 073/105] Update submodules on '5.13' in qt/qt5 Change-Id: I75182fb8b231e3086a77c1778320cf0f2590cf92 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtsensors | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebview | 2 +- qtwinextras | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/qtbase b/qtbase index 0d9f43d5..ac5e198d 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 0d9f43d534983411e37a9f3912de272a4a6ced64 +Subproject commit ac5e198db4eea4670a5a4a22fb44eb8a6acc4c47 diff --git a/qtdoc b/qtdoc index d952a1c0..a7bacc5e 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit d952a1c09db2d5faf3de6c2b1e5218b26246e6d2 +Subproject commit a7bacc5e4b357ef3b0d8901963c5f7bb1462720b diff --git a/qtgamepad b/qtgamepad index 572ef46c..324dd701 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 572ef46c5fd98e1052211051362e7c48930deacd +Subproject commit 324dd701ec755684a2bc5c7e8b2d5413316f2f53 diff --git a/qtlocation b/qtlocation index 55e127bb..720beeb3 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 55e127bb430aaea9ebf4c770c9efb228e019af25 +Subproject commit 720beeb3f768af5e89538dfe0429e31138e84e3c diff --git a/qtmultimedia b/qtmultimedia index 43cd99e6..fdf2f673 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 43cd99e688860112aa0dce06e1adb7bde4a06edc +Subproject commit fdf2f673701fec9c3b99ad5e602d771c0b5ab9c9 diff --git a/qtsensors b/qtsensors index 220ab35b..9b4c2e4f 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 220ab35bfd864cb390e9051b9563587319f58bd4 +Subproject commit 9b4c2e4fcbe8700f0cf95cda887476e9a2d3a545 diff --git a/qttools b/qttools index 5cfa917b..488f2454 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 5cfa917baf416f6234bd99e51f05514b1859e2fe +Subproject commit 488f24540d087ae98fff4b3a4de82bdf9acbc72c diff --git a/qtwayland b/qtwayland index 7e658cf2..8f6c41e4 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 7e658cf26dc6e85dbe4a4216f7294dbb3a928dcc +Subproject commit 8f6c41e49e320de9e0921801ab87a45f6e6f9fa9 diff --git a/qtwebview b/qtwebview index b206dd8a..ca79ed44 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit b206dd8a3ccff693eed9bdc271351ed613f23fdf +Subproject commit ca79ed44d8c5cfa4270d5eca824a76cbcb5887fe diff --git a/qtwinextras b/qtwinextras index fb6d18a1..15b00862 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit fb6d18a116dea6f8f1db61053454ce77c17f0e97 +Subproject commit 15b0086268a33e6469e300da9817f723ade0a588 From 3b335077f7b05d025d95f254fe3c2401a71ca25c Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Mon, 23 Sep 2019 10:25:30 +0200 Subject: [PATCH 074/105] Update submodules on '5.14' in qt/qt5 Change-Id: Ic0e53050e8a7c0928e0ca9ee17f30a303957ea84 Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtandroidextras | 2 +- qtbase | 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 +- qtqa | 2 +- qtquick3d | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtrepotools | 2 +- qtscript | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtspeech | 2 +- qtsvg | 2 +- qttools | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebglplugin | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 39 files changed, 39 insertions(+), 39 deletions(-) diff --git a/qt3d b/qt3d index 7814da64..42e11789 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 7814da64942c4566e2fa9c9e2bd2a1e169e7fab9 +Subproject commit 42e11789e4a2de7729ccba30dc465ca48e09e5e7 diff --git a/qtactiveqt b/qtactiveqt index e9f78ada..203c6f9c 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit e9f78adad0205ff539a35587be86c8e7a0bfd5bd +Subproject commit 203c6f9cc25f2bb40f6098f50e587467f874cf15 diff --git a/qtandroidextras b/qtandroidextras index d9378c43..9f633863 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit d9378c4324ddf6febbcd0e4ae052b384f75acca4 +Subproject commit 9f63386339a69358f61f30ffa17a9c8ae3ec9b98 diff --git a/qtbase b/qtbase index 08ad9640..bc35941d 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 08ad96404b4c915eece1a547bf12e91664e7cdff +Subproject commit bc35941dbbf6cbd09805a2217ecb062c565855ad diff --git a/qtcharts b/qtcharts index ff84fb0f..98fe0e8d 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit ff84fb0fdaf7ed1a0b646705dcf8b0254f862cd3 +Subproject commit 98fe0e8db097919ffc727194749753cc8dcb52f4 diff --git a/qtconnectivity b/qtconnectivity index 2c6dcc64..87617df9 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 2c6dcc643f29c212fca0ead123a377e96b9a17c9 +Subproject commit 87617df961fd5e7a1d7c3e3ceba4125ca7090f9e diff --git a/qtdatavis3d b/qtdatavis3d index 548b93d6..a1d12993 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 548b93d6e5e70afeb220502170a51cc2e2510139 +Subproject commit a1d12993858a3da5077c5edce7449618ce8f392d diff --git a/qtdeclarative b/qtdeclarative index 90a706df..3fb574d0 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 90a706dffb944e7d18b8b199b1cea68633e2b172 +Subproject commit 3fb574d01c106e786f9a43ef1e0d781e156d52fa diff --git a/qtdoc b/qtdoc index b490a202..cdcda090 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit b490a2028f4c03783e76646bf9ff47e3601bf14d +Subproject commit cdcda09055c35b8faf08588a4bba5369571ce3c5 diff --git a/qtgamepad b/qtgamepad index ea0457b8..2e83eda3 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit ea0457b8058191b4bb22477c7b51975a70af0b0e +Subproject commit 2e83eda3e897edd440ed064f8cf12890e8a54591 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index cb8c2803..551b1fe3 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit cb8c28031c60c708721ef8a875076f12a630e6b9 +Subproject commit 551b1fe346c5704e5ca22d8d4e8b34478f38e2fa diff --git a/qtimageformats b/qtimageformats index 44000c87..ac8a82f5 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 44000c87d352e4f88b7eea3d441a807b755698d3 +Subproject commit ac8a82f5ffd08b0b9f8f76be29158ce7e113cb46 diff --git a/qtlocation b/qtlocation index 08972f5e..0cb5a2f4 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 08972f5e65c8d7286fe1435cb85be4574ac3772f +Subproject commit 0cb5a2f498b38331c6c3bdd5d53777acadd5feea diff --git a/qtmacextras b/qtmacextras index af348830..cec26a6e 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit af348830a3ae6852a4e7ff612c045e11c094ef5f +Subproject commit cec26a6e34b611a584d4a33c0a427ff2cd4bc2e8 diff --git a/qtmultimedia b/qtmultimedia index 38e49d06..034c7310 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 38e49d060d13ef592f457a5d6640d68a2d9c6b06 +Subproject commit 034c731008254970f4d577e8718f32d939ddfbab diff --git a/qtnetworkauth b/qtnetworkauth index 272ea7f5..9226e90f 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit 272ea7f508d8ee30311c08c07c6e0501f17338c2 +Subproject commit 9226e90f4a39cfbaff5db05cb0360681acfa76b9 diff --git a/qtpurchasing b/qtpurchasing index bc6d5686..597d8416 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit bc6d56861b93bd87958baa3384c3cbd895f1c3f9 +Subproject commit 597d84162559291072eacc2c61aa872f01ef442a diff --git a/qtqa b/qtqa index cd7003a5..1652766d 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit cd7003a5bb8cf022044ee0fe0e10e5e601dbfcf2 +Subproject commit 1652766da458448756d08e4a09dee1b16700c473 diff --git a/qtquick3d b/qtquick3d index fa5d0b45..6df1e06b 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit fa5d0b457c5e31cea5a1bddad574d4505c93174f +Subproject commit 6df1e06b8fbf6df18ae21814d0d6976bb75e54a9 diff --git a/qtquickcontrols b/qtquickcontrols index 6ab10d97..5b9e833e 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 6ab10d971d7d98eeaa50203c24d53da35cfe2187 +Subproject commit 5b9e833e77b269a41f51aa65c238c8b23a82b7a7 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index e0b2a303..0cab878a 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit e0b2a30357a6fbb2d52fcba69f0a5059d3b065b8 +Subproject commit 0cab878ae937451c8b53262cde7a05e7feaec0a6 diff --git a/qtremoteobjects b/qtremoteobjects index acb75637..81f93064 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit acb75637a429d1a540b0b86b35554f75bd13b44b +Subproject commit 81f93064cb74a6acffc04d218d5d8fe16ce26e25 diff --git a/qtrepotools b/qtrepotools index 37df2fd6..3b937032 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 37df2fd634feac3458c19b8a37a44a36f8e3a72f +Subproject commit 3b937032f51c75b3f517e02b1db670884a8dc103 diff --git a/qtscript b/qtscript index 1de1f080..07797916 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 1de1f080ef4b37576843bd59a8aa3e484c918820 +Subproject commit 0779791684b3094d329cfe8e0c8550c091be1eed diff --git a/qtscxml b/qtscxml index 07c62001..99349b79 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 07c62001b55b515629062ccc51e8c12aaa7d4eec +Subproject commit 99349b791bfbd54b5cdb290dea6656949b50963d diff --git a/qtsensors b/qtsensors index c4519ffc..f9e12e11 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit c4519ffcfc009d4ffbfa77bfa1b7c9749b9fe7dc +Subproject commit f9e12e11274f0969b8829f5e0718960ee0b90114 diff --git a/qtserialbus b/qtserialbus index 47eaa2b1..be05a824 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 47eaa2b1a58db67643f32cb1d8779c5b199ccb10 +Subproject commit be05a82406c2b82d0b2bc0aa4866df31a46c2352 diff --git a/qtserialport b/qtserialport index 78bfc0a9..ba7eb731 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit 78bfc0a93077dafb217f854782e14b65a5746949 +Subproject commit ba7eb7316d8586c6a30e759c26fed30c5b0ff5ae diff --git a/qtspeech b/qtspeech index c1860e04..98fc28e6 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit c1860e04dfcf9eddcf14cbc4e44f441ad75ffc83 +Subproject commit 98fc28e6c681ce89d377e2613b6faf2e7c44147e diff --git a/qtsvg b/qtsvg index d8ccc52c..a7cb5408 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit d8ccc52c038a033b20c96041b998322a907521c4 +Subproject commit a7cb54082e3fd47758b8f17b0ece15a2f8c38aa5 diff --git a/qttools b/qttools index 01d70a31..9e1bc971 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 01d70a3150191445b043873db2a19474983a411e +Subproject commit 9e1bc9718d66afe9bf5bbb92d5bb6d3538dc037b diff --git a/qtwayland b/qtwayland index 7da25445..d8c19df2 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 7da254456001193f93100070e229fc6cffc92495 +Subproject commit d8c19df22a1ff6ee40373a96fa12183acfc1b452 diff --git a/qtwebengine b/qtwebengine index 8daefcfd..16192598 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 8daefcfd8e1bf41ae4d06c7a79a526b81a78dc58 +Subproject commit 16192598a84eaf9ac9a50b7cca6ac5e4c21bb5e8 diff --git a/qtwebglplugin b/qtwebglplugin index e51341cf..64b88a7f 160000 --- a/qtwebglplugin +++ b/qtwebglplugin @@ -1 +1 @@ -Subproject commit e51341cf20447c42a62281e633513837058f62e5 +Subproject commit 64b88a7fbd90cb1f78eacf2a8fd1104876c32836 diff --git a/qtwebsockets b/qtwebsockets index 87a5151a..04c23a29 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 87a5151adfc9947f2ab2e560fea7da0088eb59c6 +Subproject commit 04c23a295d757c43c16f911fd25c912a78b57b62 diff --git a/qtwebview b/qtwebview index fb2a2003..dac0467b 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit fb2a2003fbb41ac91b319afb56f290b415befb64 +Subproject commit dac0467b50f9dd5795f26cb2df7970785d658bfc diff --git a/qtwinextras b/qtwinextras index ee2d2f7a..6e8e97f0 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit ee2d2f7a93c5b0866e91293d6233ae2703281ca6 +Subproject commit 6e8e97f0e6b144a67702602c138b9931280681fd diff --git a/qtx11extras b/qtx11extras index a0443bd7..58ee6c58 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit a0443bd723601205c8cc4666dd89be5a32decf98 +Subproject commit 58ee6c5866440b69f6a9d7a58f0fbeefbd578bc1 diff --git a/qtxmlpatterns b/qtxmlpatterns index 85bec28a..af8b508d 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 85bec28aafc05c9b1fe3428832ee18af82747123 +Subproject commit af8b508de56fee70d6f3c971254fcb848805d18f From 1760acb17d0b5938ed827246c88baa00cba47c9a Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 23 Sep 2019 23:31:04 +0200 Subject: [PATCH 075/105] Update submodules on '5.13' in qt/qt5 Change-Id: I5405348497e527dc5b4b1ff411736ffebeedb246 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtqa | 2 +- qtrepotools | 2 +- qtserialbus | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qtbase b/qtbase index ac5e198d..a8ec52d5 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit ac5e198db4eea4670a5a4a22fb44eb8a6acc4c47 +Subproject commit a8ec52d5e76bc769ed63be1ad543be8f687e5dac diff --git a/qtconnectivity b/qtconnectivity index c1803d26..d3ace860 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit c1803d266854c6f71994705133e5b2b93a060d1e +Subproject commit d3ace86011d4e34eeafa795270ac027afd54f857 diff --git a/qtdeclarative b/qtdeclarative index 5e96f43f..36be2726 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 5e96f43fe03e16d7ca68f0dd888c4518a98694f2 +Subproject commit 36be27265d61c76b25417a25e482030e30ff380f diff --git a/qtdoc b/qtdoc index a7bacc5e..3825a45d 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit a7bacc5e4b357ef3b0d8901963c5f7bb1462720b +Subproject commit 3825a45d5c17cba5298417dd68fef973f62f699c diff --git a/qtqa b/qtqa index 1652766d..8cafe2ce 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 1652766da458448756d08e4a09dee1b16700c473 +Subproject commit 8cafe2ce3fd9302b29cb8cbfc93414cc6fc7d83c diff --git a/qtrepotools b/qtrepotools index 3b937032..a51db43b 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 3b937032f51c75b3f517e02b1db670884a8dc103 +Subproject commit a51db43b580f774c64275cd3e1e0c707de2a04a4 diff --git a/qtserialbus b/qtserialbus index e6b042a7..80144b89 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit e6b042a795902226c7d7f1ec576c8e063ef76740 +Subproject commit 80144b89ca1adede0db9d6e485037f5e431216c3 From f60588ee72c5d660a9f27cd56d3fc5187f1290bc Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 23 Sep 2019 22:31:33 +0200 Subject: [PATCH 076/105] Update submodules on '5.14' in qt/qt5 Change-Id: I2a4d65f7cd94f3a6ce7036f20b8a545a160434d8 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtrepotools | 2 +- qtserialbus | 2 +- qttools | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qt3d b/qt3d index 42e11789..5815bb74 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 42e11789e4a2de7729ccba30dc465ca48e09e5e7 +Subproject commit 5815bb74788f9c0f355754d6a56cfa527684ea98 diff --git a/qtbase b/qtbase index bc35941d..70c053ee 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit bc35941dbbf6cbd09805a2217ecb062c565855ad +Subproject commit 70c053ee684448984b1f762abd3b40884cece2fa diff --git a/qtdeclarative b/qtdeclarative index 3fb574d0..e2df4233 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 3fb574d01c106e786f9a43ef1e0d781e156d52fa +Subproject commit e2df4233a77ce8a37d2c8ef26b7b42fc0d33a24b diff --git a/qtqa b/qtqa index 1652766d..8cafe2ce 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 1652766da458448756d08e4a09dee1b16700c473 +Subproject commit 8cafe2ce3fd9302b29cb8cbfc93414cc6fc7d83c diff --git a/qtquick3d b/qtquick3d index 6df1e06b..6e9c2fd3 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 6df1e06b8fbf6df18ae21814d0d6976bb75e54a9 +Subproject commit 6e9c2fd37634e222aa13f9cbd6c8fc5fff7b5500 diff --git a/qtrepotools b/qtrepotools index 3b937032..a51db43b 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 3b937032f51c75b3f517e02b1db670884a8dc103 +Subproject commit a51db43b580f774c64275cd3e1e0c707de2a04a4 diff --git a/qtserialbus b/qtserialbus index be05a824..38def2c0 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit be05a82406c2b82d0b2bc0aa4866df31a46c2352 +Subproject commit 38def2c0817291c09c440c074f011c4f684eaccf diff --git a/qttools b/qttools index 9e1bc971..3179a484 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 9e1bc9718d66afe9bf5bbb92d5bb6d3538dc037b +Subproject commit 3179a484e03df899c70be234750081eca599416f From 2cec2c5f8c4521b7aef519849723b51d5de74ab8 Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Mon, 16 Sep 2019 14:52:49 +0300 Subject: [PATCH 077/105] Add build for combined android targets From 5.14 -> android builds are done by default at one go. Add new builds for doing that. Removing old, separate builds will be removed in a follow-up patch to give time for packaging to adapt that new system Change-Id: I42f094c7940f3914d7e00feda71cc74f7a26655f Reviewed-by: BogDan Vatra Reviewed-by: Eskil Abrahamsen Blomfeldt --- coin/platform_configs/default.yaml | 8 ++++++++ coin/platform_configs/qt5.yaml | 16 ++++++++++++++++ 2 files changed, 24 insertions(+) diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index b98c451e..f15a2bc5 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -114,6 +114,14 @@ Configurations: Compiler: 'Clang' Features: ['DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -debug-and-release -nomake tests -nomake examples -no-sql-mysql -no-sql-psql -plugin-sql-sqlite -xplatform macx-watchos-clang' +- + Template: 'qtci-linux-RHEL-7.6-x86_64' + Target os: 'Android_ANY' + Target arch: 'multi' + Compiler: 'Clang' + Target compiler: 'Clang' + Features: ['Packaging', 'DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -no-use-gold-linker -sysconfdir /etc/xdg -opengl es2 -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r20 -android-ndk-host linux-x86_64 -xplatform android-clang' - Template: 'qtci-linux-RHEL-7.6-x86_64' Target os: 'Android_ANY' diff --git a/coin/platform_configs/qt5.yaml b/coin/platform_configs/qt5.yaml index f502de7c..d813c9cd 100644 --- a/coin/platform_configs/qt5.yaml +++ b/coin/platform_configs/qt5.yaml @@ -50,6 +50,14 @@ Target compiler: 'Clang' Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-use-gold-linker -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I {{.Env.OPENSSL_ANDROID_HOME}}/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r20 -android-ndk-host linux-x86_64 -android-arch x86_64' +- + Template: 'qtci-windows-10-x86_64-14' + Target os: 'Android_ANY' + Target arch: 'multi' + Compiler: 'Mingw73' + Target compiler: 'Clang' + Features: ['Packaging', 'DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -opengl es2 -sysconfdir /etc/xdg -openssl -I c:\utils\openssl-android-master\include -xplatform android-clang -android-sdk C:\Utils\Android -android-ndk c:\Utils\Android\android-ndk-r20' - Template: 'qtci-windows-10-x86_64-14' Target os: 'Android_ANY' @@ -90,6 +98,14 @@ Target compiler: 'Clang' Features: ['Packaging', 'DisableTests'] Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r20 -android-ndk-host darwin-x86_64 -android-arch armeabi-v7a' +- + Template: 'qtci-macos-10.13-x86_64-2' + Target os: 'Android_ANY' + Target arch: 'multi' + Compiler: 'Clang' + Target compiler: 'Clang' + Features: ['Packaging', 'DisableTests'] + Configure arguments: '-opensource -confirm-license -verbose -prefix /Users/qt/work/install -release -nomake tests -nomake examples -no-sql-mysql -no-dbus -no-qpa-platform-guard -opengl es2 -sysconfdir /etc/xdg -openssl -I /usr/local/opt/openssl/include -xplatform android-clang -android-sdk /opt/android/sdk -android-ndk /opt/android/android-ndk-r20 -android-ndk-host darwin-x86_64' - Template: 'qtci-macos-10.13-x86_64-2' Target os: 'Android_ANY' From 41ef5a706d4cd56e37c67195da4c59e24e1400e4 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 24 Sep 2019 23:30:59 +0200 Subject: [PATCH 078/105] Update submodules on '5.13' in qt/qt5 Change-Id: I239abc4de7cec9c5366d177933a4b16c85067971 Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtquickcontrols2 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtbase b/qtbase index a8ec52d5..06cc5d30 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit a8ec52d5e76bc769ed63be1ad543be8f687e5dac +Subproject commit 06cc5d307177ebacf8e6926b9690c12703004a1a diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 6815f353..d39a6d80 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 6815f353e5a73c0dcf39fbfc91c6a2c1b0784324 +Subproject commit d39a6d80f63414a4e933ac2f859805635850942a From ad2113fd235411f3669df8e6106dc7f5a760f9f8 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 24 Sep 2019 22:31:14 +0200 Subject: [PATCH 079/105] Update submodules on '5.14' in qt/qt5 Change-Id: Ia3abeacaa4604fecfa0024e1db901d08510d60c6 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtvirtualkeyboard | 2 +- qtwebview | 2 +- qtwinextras | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/qt3d b/qt3d index 5815bb74..3ad35737 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 5815bb74788f9c0f355754d6a56cfa527684ea98 +Subproject commit 3ad357371468c0da04b2964f040da41506379178 diff --git a/qtdeclarative b/qtdeclarative index e2df4233..7782a211 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit e2df4233a77ce8a37d2c8ef26b7b42fc0d33a24b +Subproject commit 7782a211d1c503d9634589e4ab837e6e53f343c0 diff --git a/qtdoc b/qtdoc index cdcda090..3bf066bd 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit cdcda09055c35b8faf08588a4bba5369571ce3c5 +Subproject commit 3bf066bdad5b4a3cdcd7b7c79985d2eef74b598a diff --git a/qtgamepad b/qtgamepad index 2e83eda3..256bcfb7 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 2e83eda3e897edd440ed064f8cf12890e8a54591 +Subproject commit 256bcfb73570c3f732ee5a7fcb0d40b3c08d55ff diff --git a/qtlocation b/qtlocation index 0cb5a2f4..6b5b03c1 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 0cb5a2f498b38331c6c3bdd5d53777acadd5feea +Subproject commit 6b5b03c17008fd93e8e152f7e46f1bafe6568018 diff --git a/qtmultimedia b/qtmultimedia index 034c7310..6a563af7 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 034c731008254970f4d577e8718f32d939ddfbab +Subproject commit 6a563af70fb811b115b9f87b8d6ff58928102b2a diff --git a/qtquick3d b/qtquick3d index 6e9c2fd3..e0866f04 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 6e9c2fd37634e222aa13f9cbd6c8fc5fff7b5500 +Subproject commit e0866f04f1aa21252b2972408ee899a38c9a52d2 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 0cab878a..006c0551 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 0cab878ae937451c8b53262cde7a05e7feaec0a6 +Subproject commit 006c0551cc9a515e89cb7d1dfa5ad2fe8531da2a diff --git a/qtsensors b/qtsensors index f9e12e11..e48a2a27 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit f9e12e11274f0969b8829f5e0718960ee0b90114 +Subproject commit e48a2a270b74c80744dcff48e889d09bf5cdcc77 diff --git a/qtserialbus b/qtserialbus index 38def2c0..77ccec69 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 38def2c0817291c09c440c074f011c4f684eaccf +Subproject commit 77ccec69263567b2b41244e483dfb083b883c6d8 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 997a4c23..e6850606 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 997a4c23d5c062644eda3b0db74252654289bdc5 +Subproject commit e685060648032a405fa286d19d50f065ac40510c diff --git a/qtwebview b/qtwebview index dac0467b..ffb73c62 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit dac0467b50f9dd5795f26cb2df7970785d658bfc +Subproject commit ffb73c620595c80ee61c9c0e252aa11396c8b83b diff --git a/qtwinextras b/qtwinextras index 6e8e97f0..75218552 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 6e8e97f0e6b144a67702602c138b9931280681fd +Subproject commit 75218552031152de935c9fd3290fb903da0a3d92 From d1a81a8e1c96634fbb7b39c08d5b6c0b4990d8da Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 25 Sep 2019 22:31:21 +0200 Subject: [PATCH 080/105] Update submodules on '5.14' in qt/qt5 Change-Id: I15e5942e323d9315fc92d3a907106367f7710d09 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtquick3d | 2 +- qtquickcontrols | 2 +- qtserialport | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qt3d b/qt3d index 3ad35737..29dc5ced 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 3ad357371468c0da04b2964f040da41506379178 +Subproject commit 29dc5ced83b9d992ca533711d25ab31ebe984ee4 diff --git a/qtbase b/qtbase index 70c053ee..dc042c6d 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 70c053ee684448984b1f762abd3b40884cece2fa +Subproject commit dc042c6deea7e90b4a9dfcffdc33cbe61df421bd diff --git a/qtdeclarative b/qtdeclarative index 7782a211..c734eb3a 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 7782a211d1c503d9634589e4ab837e6e53f343c0 +Subproject commit c734eb3a8bda3b24721d80c380189c5e754a9b38 diff --git a/qtquick3d b/qtquick3d index e0866f04..c0447d7c 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit e0866f04f1aa21252b2972408ee899a38c9a52d2 +Subproject commit c0447d7c96fff84981ac4cd6fa1aa8e1a6b60645 diff --git a/qtquickcontrols b/qtquickcontrols index 5b9e833e..219b55fa 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 5b9e833e77b269a41f51aa65c238c8b23a82b7a7 +Subproject commit 219b55faa4848a4967bb34e34d4326a854b12e2a diff --git a/qtserialport b/qtserialport index ba7eb731..aa00e8eb 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit ba7eb7316d8586c6a30e759c26fed30c5b0ff5ae +Subproject commit aa00e8eb623d5cb4ba32860dd3671a87f3763f89 diff --git a/qtwayland b/qtwayland index d8c19df2..e579a0d8 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit d8c19df22a1ff6ee40373a96fa12183acfc1b452 +Subproject commit e579a0d8bdfb69649a9c22add5651d6dabcf142c diff --git a/qtwebengine b/qtwebengine index 16192598..2a306349 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 16192598a84eaf9ac9a50b7cca6ac5e4c21bb5e8 +Subproject commit 2a306349512dd47fefa7a7f1ee7e84e374e6334a From cb8e769cf611f519a45e11697ea27ad1e4b963b3 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 25 Sep 2019 23:31:02 +0200 Subject: [PATCH 081/105] Update submodules on '5.13' in qt/qt5 Change-Id: I2c212ec01df2fa67cad4d9e84988d0b31678e6fe Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdoc | 2 +- qtmultimedia | 2 +- qtquickcontrols | 2 +- qtwayland | 2 +- qtwebengine | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/qtbase b/qtbase index 06cc5d30..94788314 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 06cc5d307177ebacf8e6926b9690c12703004a1a +Subproject commit 947883141d9d8b3079a8a21981ad8a5ce3c4798e diff --git a/qtdoc b/qtdoc index 3825a45d..21d65d5c 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 3825a45d5c17cba5298417dd68fef973f62f699c +Subproject commit 21d65d5c2dbfadb3e6dae0707f2ba6e0d4bb2c30 diff --git a/qtmultimedia b/qtmultimedia index fdf2f673..bf6ac0f0 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit fdf2f673701fec9c3b99ad5e602d771c0b5ab9c9 +Subproject commit bf6ac0f0df5510aa65ecd9bb050bd13d47089d4a diff --git a/qtquickcontrols b/qtquickcontrols index ac9f2e58..da94d658 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit ac9f2e582dc6c0f740b8c5b225bc65a8c1b35e9e +Subproject commit da94d6586cbe6b9c12dec8ecc0f842aad807b0d3 diff --git a/qtwayland b/qtwayland index 8f6c41e4..1ed0782e 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 8f6c41e49e320de9e0921801ab87a45f6e6f9fa9 +Subproject commit 1ed0782e93dafb0a3d5ef3a02c9c3999825817ee diff --git a/qtwebengine b/qtwebengine index d8fe250e..e31acc86 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit d8fe250e542519012247952a034e78b0d492b730 +Subproject commit e31acc86e991d6f83bd56eebb7371914fc9ca5ac From e6fccbf2407bcb7f4006fd70a2af16451e3a44f1 Mon Sep 17 00:00:00 2001 From: Dimitrios Apostolou Date: Wed, 31 Jul 2019 12:05:34 +0200 Subject: [PATCH 082/105] Remove the progress bar from the sdkmanager output MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cleans up many thousands of useless lines from the logs. Change-Id: I2673f65b713996637d2161da4db726823e17c0df Reviewed-by: Tony Sarajärvi --- .../common/linux/android_linux.sh | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/coin/provisioning/common/linux/android_linux.sh b/coin/provisioning/common/linux/android_linux.sh index 5840d4b4..b83c1c6e 100755 --- a/coin/provisioning/common/linux/android_linux.sh +++ b/coin/provisioning/common/linux/android_linux.sh @@ -80,14 +80,22 @@ else sudo chown -R qt:users "$targetFolder" fi +# Run the following command under `eval` or `sh -c` so that the shell properly splits it +sdkmanager_no_progress_bar_cmd="tr '\r' '\n' | grep -v '^\[[ =]*\]'" + echo "Running SDK manager for platforms;$sdkApiLevel, platform-tools and build-tools;$sdkBuildToolsVersion." # shellcheck disable=SC2031 if [ "$http_proxy" != "" ]; then proxy_host=$(echo "$proxy" | cut -d'/' -f3 | cut -d':' -f1) proxy_port=$(echo "$proxy" | cut -d':' -f3) - echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" --no_https --proxy=http --proxy_host="$proxy_host" --proxy_port="$proxy_port" "platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion" + echo "y" | "$sdkTargetFolder/tools/bin/sdkmanager" \ + --no_https --proxy=http --proxy_host="$proxy_host" --proxy_port="$proxy_port" \ + "platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion" \ + | eval $sdkmanager_no_progress_bar_cmd else - echo "y" |"$sdkTargetFolder/tools/bin/sdkmanager" "platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion" + echo "y" | "$sdkTargetFolder/tools/bin/sdkmanager" \ + "platforms;$sdkApiLevel" "platform-tools" "build-tools;$sdkBuildToolsVersion" \ + | eval $sdkmanager_no_progress_bar_cmd fi echo "Checking the contents of Android SDK..." @@ -106,8 +114,11 @@ echo "Android SDK API level = $sdkApiLevel" >> ~/versions.txt echo "Android NDK = $ndkVersion" >> ~/versions.txt cd "$sdkTargetFolder/tools/bin" -./sdkmanager --install "emulator" -echo "y" | ./sdkmanager --install "system-images;android-21;google_apis;x86" +./sdkmanager --install "emulator" \ + | eval $sdkmanager_no_progress_bar_cmd +echo "y" | ./sdkmanager --install "system-images;android-21;google_apis;x86" \ + | eval $sdkmanager_no_progress_bar_cmd + echo "Checking the contents of Android SDK again..." ls -l "$sdkTargetFolder" From c87a6e9c6d5ee208526e40badfcd12c51f65cf2c Mon Sep 17 00:00:00 2001 From: Dimitrios Apostolou Date: Wed, 31 Jul 2019 12:16:50 +0200 Subject: [PATCH 083/105] Fix delays caused by PackageKit locking RPMDB MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit It seems that disabling it is not enough, it has to be fully removed. It is also removed later in the scripts but it wasn't enough apparently, so no harm done removing it twice. Change-Id: If1a4f032240e66100b68bca3196a700cb570701e Reviewed-by: Tony Sarajärvi --- coin/provisioning/qtci-linux-RHEL-7.6-x86_64/02-enable-repos.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/02-enable-repos.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/02-enable-repos.sh index 548cb9ca..28f7faa0 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/02-enable-repos.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/02-enable-repos.sh @@ -38,6 +38,7 @@ set -ex echo "set WritePreparedUpdates=false" | sudo tee -a /etc/PackageKit/PackageKit.conf sudo systemctl stop packagekit sudo systemctl disable packagekit +sudo yum -y remove PackageKit gnome-software sudo subscription-manager config --rhsm.manage_repos=0 sudo subscription-manager refresh From acfc7ad18d311922d58890381c23b854c0c5402b Mon Sep 17 00:00:00 2001 From: Dimitrios Apostolou Date: Wed, 31 Jul 2019 12:21:51 +0200 Subject: [PATCH 084/105] Fix message "RPMDB altered outside of yum" MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit yum install supports a local filename on RHEL 6 or newer. Change-Id: I873ab3dfab56003ded45bc6c4099aae150f423dd Reviewed-by: Tony Sarajärvi --- .../qtci-linux-RHEL-6.6-x86_64/03-install-rhel-epel.sh | 3 +-- .../qtci-linux-RHEL-7.6-x86_64/03-install-rhel-epel.sh | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/03-install-rhel-epel.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/03-install-rhel-epel.sh index 21a45506..91097dbf 100755 --- a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/03-install-rhel-epel.sh +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/03-install-rhel-epel.sh @@ -44,6 +44,5 @@ targetFile="/tmp/$package" DownloadURL "$primaryUrl" "$cacheUrl" "$sha1" "$targetFile" -sudo rpm -ivh "$targetFile" +sudo yum -y install "$targetFile" rm "$targetFile" - diff --git a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/03-install-rhel-epel.sh b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/03-install-rhel-epel.sh index 5cdf7df0..0a29d842 100755 --- a/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/03-install-rhel-epel.sh +++ b/coin/provisioning/qtci-linux-RHEL-7.6-x86_64/03-install-rhel-epel.sh @@ -46,6 +46,5 @@ targetFile="/tmp/$package" DownloadURL "$primaryUrl" "$cacheUrl" "$sha1" "$targetFile" -sudo rpm -ivh "$targetFile" +sudo yum -y install "$targetFile" rm "$targetFile" - From bdc5dae67b8d36d797a42c5e2dc72a1510b81e27 Mon Sep 17 00:00:00 2001 From: Dimitrios Apostolou Date: Mon, 12 Aug 2019 19:14:10 +0200 Subject: [PATCH 085/105] Speed up provisioning on Linux MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I6e4e5621ed0b063215476ef51d61ef1f38198d0c Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/unix/install_protobuff.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coin/provisioning/common/unix/install_protobuff.sh b/coin/provisioning/common/unix/install_protobuff.sh index 59e9b699..a9b2cfd0 100755 --- a/coin/provisioning/common/unix/install_protobuff.sh +++ b/coin/provisioning/common/unix/install_protobuff.sh @@ -64,7 +64,7 @@ if uname -a |grep -q Darwin; then else ./configure fi -make +make -j5 sudo make install # Refresh shared library cache if OS isn't macOS From b97df21bef1d6a9deab1c62eaa1cbb8f477819ad Mon Sep 17 00:00:00 2001 From: Dimitrios Apostolou Date: Wed, 14 Aug 2019 15:24:32 +0200 Subject: [PATCH 086/105] Brew update only once MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I6c2650574b6b62ceedfc95a9caab7ca26a6fa10b Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/macos/homebrew.sh | 2 ++ coin/provisioning/common/macos/libiodbc.sh | 1 - coin/provisioning/qtci-macos-10.12-x86_64/26-p7zip.sh | 2 +- coin/provisioning/qtci-macos-10.13-x86_64/26-p7zip.sh | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/coin/provisioning/common/macos/homebrew.sh b/coin/provisioning/common/macos/homebrew.sh index a6efe123..f7042de3 100755 --- a/coin/provisioning/common/macos/homebrew.sh +++ b/coin/provisioning/common/macos/homebrew.sh @@ -1,3 +1,5 @@ #!/usr/bin/env bash # Will install homebrew package manager for macOS /usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" Date: Thu, 15 Aug 2019 13:55:07 +0200 Subject: [PATCH 087/105] Increase open files and processes limit on macOS MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: If93bbe067f76168a7c131c6ced187f00a8d908e1 Reviewed-by: Tony Sarajärvi --- .../common/macos/increase_limits.sh | 72 +++++++++++++++++++ .../common/macos/limit.maxfiles.plist | 20 ++++++ .../common/macos/limit.maxproc.plist | 20 ++++++ .../01-increase_limits.sh | 44 ++++++++++++ .../01-increase_limits.sh | 44 ++++++++++++ .../01-increase_limits.sh | 44 ++++++++++++ 6 files changed, 244 insertions(+) create mode 100755 coin/provisioning/common/macos/increase_limits.sh create mode 100644 coin/provisioning/common/macos/limit.maxfiles.plist create mode 100644 coin/provisioning/common/macos/limit.maxproc.plist create mode 100755 coin/provisioning/qtci-macos-10.12-x86_64/01-increase_limits.sh create mode 100755 coin/provisioning/qtci-macos-10.13-x86_64/01-increase_limits.sh create mode 100755 coin/provisioning/qtci-macos-10.14-x86_64/01-increase_limits.sh diff --git a/coin/provisioning/common/macos/increase_limits.sh b/coin/provisioning/common/macos/increase_limits.sh new file mode 100755 index 00000000..666d9067 --- /dev/null +++ b/coin/provisioning/common/macos/increase_limits.sh @@ -0,0 +1,72 @@ +#!/bin/sh + +############################################################################# +## +## Copyright (C) 2019 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$ +## +############################################################################# + + +# Increase the soft and hard RLIMIT_NOFILE and RLIMIT_NPROC limits. +# By default they are 256/unlimited and 709/1064 +# and they sometimes create problems to the build process and telegraf. + + +# Must have this variable set in the environment +[ x"$PROVISION_DIR" = x ] && exit 38 + + +echo "Current limits are:" +ulimit -a +launchctl limit + +sudo cp $PROVISION_DIR/common/macos/limit.maxfiles.plist /Library/LaunchDaemons/ +sudo cp $PROVISION_DIR/common/macos/limit.maxproc.plist /Library/LaunchDaemons/ + +sudo chown root:wheel /Library/LaunchDaemons/limit.maxfiles.plist +sudo chown root:wheel /Library/LaunchDaemons/limit.maxproc.plist + +sudo chmod 644 /Library/LaunchDaemons/limit.maxfiles.plist +sudo chmod 644 /Library/LaunchDaemons/limit.maxproc.plist + +# Activate the new limits immediately (not for the current session though) +sudo launchctl load -w /Library/LaunchDaemons/limit.maxfiles.plist +sudo launchctl load -w /Library/LaunchDaemons/limit.maxproc.plist + +echo "After adjusting, limits are:" +ulimit -a +launchctl limit + + +# NOTE: If the limits are not increased enough, it might be because of +# restrictions set by the kernel. They can be temporarily altered with: + +# sudo sysctl -w kern.maxproc=xxxx +# sudo sysctl -w kern.maxprocperuid=xxx diff --git a/coin/provisioning/common/macos/limit.maxfiles.plist b/coin/provisioning/common/macos/limit.maxfiles.plist new file mode 100644 index 00000000..1bf85214 --- /dev/null +++ b/coin/provisioning/common/macos/limit.maxfiles.plist @@ -0,0 +1,20 @@ + + + + + Label + limit.maxfiles + ProgramArguments + + launchctl + limit + maxfiles + 65536 + 524288 + + RunAtLoad + + ServiceIPC + + + diff --git a/coin/provisioning/common/macos/limit.maxproc.plist b/coin/provisioning/common/macos/limit.maxproc.plist new file mode 100644 index 00000000..0c2cc0e9 --- /dev/null +++ b/coin/provisioning/common/macos/limit.maxproc.plist @@ -0,0 +1,20 @@ + + + + + Label + limit.maxproc + ProgramArguments + + launchctl + limit + maxproc + 8192 + 32768 + + RunAtLoad + + ServiceIPC + + + diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/01-increase_limits.sh b/coin/provisioning/qtci-macos-10.12-x86_64/01-increase_limits.sh new file mode 100755 index 00000000..c7bf7a88 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.12-x86_64/01-increase_limits.sh @@ -0,0 +1,44 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2019 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 + + +PROVISION_DIR="$(dirname "$0")/.." +export PROVISION_DIR + + +. "$PROVISION_DIR"/common/macos/increase_limits.sh diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/01-increase_limits.sh b/coin/provisioning/qtci-macos-10.13-x86_64/01-increase_limits.sh new file mode 100755 index 00000000..c7bf7a88 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.13-x86_64/01-increase_limits.sh @@ -0,0 +1,44 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2019 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 + + +PROVISION_DIR="$(dirname "$0")/.." +export PROVISION_DIR + + +. "$PROVISION_DIR"/common/macos/increase_limits.sh diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/01-increase_limits.sh b/coin/provisioning/qtci-macos-10.14-x86_64/01-increase_limits.sh new file mode 100755 index 00000000..c7bf7a88 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.14-x86_64/01-increase_limits.sh @@ -0,0 +1,44 @@ +#!/usr/bin/env bash + +############################################################################# +## +## Copyright (C) 2019 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 + + +PROVISION_DIR="$(dirname "$0")/.." +export PROVISION_DIR + + +. "$PROVISION_DIR"/common/macos/increase_limits.sh From c7f87acb3717b3b2231e9ded71e481e82a742596 Mon Sep 17 00:00:00 2001 From: Dimitrios Apostolou Date: Mon, 9 Sep 2019 10:45:47 +0200 Subject: [PATCH 088/105] Do not silence standard error MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Provisioning was failing and the logs did not provide any useful information because of the silenced squish install command. So I went through all the scripts and I re-enabled stderr logging where I found it silenced (with the exception of where it was purposeful or harmless). Change-Id: I5fa0b0ba4362970b214c150d399b6720b1780e1e Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/linux/disable-ntp_linux.sh | 2 +- coin/provisioning/common/unix/squishInstall.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/coin/provisioning/common/linux/disable-ntp_linux.sh b/coin/provisioning/common/linux/disable-ntp_linux.sh index c509d36b..dc592553 100755 --- a/coin/provisioning/common/linux/disable-ntp_linux.sh +++ b/coin/provisioning/common/linux/disable-ntp_linux.sh @@ -44,5 +44,5 @@ elif cat /etc/os-release | grep "PRETTY_NAME" | grep -q "Leap 15"; then elif cat /etc/os-release |grep "SUSE Linux Enterprise Server 15"; then sudo timedatectl set-ntp false else - (systemctl &>/dev/null && sudo systemctl disable ntpd) || sudo /sbin/chkconfig ntpd off + sudo systemctl disable ntpd || sudo /sbin/chkconfig ntpd off fi diff --git a/coin/provisioning/common/unix/squishInstall.sh b/coin/provisioning/common/unix/squishInstall.sh index b40c1922..f1b5e6b5 100755 --- a/coin/provisioning/common/unix/squishInstall.sh +++ b/coin/provisioning/common/unix/squishInstall.sh @@ -122,7 +122,7 @@ function MountAndInstall { sudo cp $targetFileMount /tmp UnMount sudo hdiutil attach "/tmp/$targetFile" - sudo /Volumes/froglogic\ Squish/Install\ Squish.app/Contents/MacOS/Squish unattended=1 targetdir="$targetDirectory/package" qtpath="$targetDirectory" > /dev/null 2>&1 + sudo /Volumes/froglogic\ Squish/Install\ Squish.app/Contents/MacOS/Squish unattended=1 targetdir="$targetDirectory/package" qtpath="$targetDirectory" > /dev/null mountFolder="/Volumes/froglogic Squish" UnMount elif [[ $targetFile == *.run ]]; then @@ -130,7 +130,7 @@ function MountAndInstall { 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 $targetDirectory/$targetFile unattended=1 targetdir="$targetDirectory/package" qtpath="$targetDirectory" > /dev/null sudo rm -fr "$targetDirectory/$targetFile" if uname -a |grep -q "Ubuntu"; then sudo mkdir /usr/lib/tcl8.6 From c0fce7a3b37db53289ffd1e44c58f0bfc0601229 Mon Sep 17 00:00:00 2001 From: Dimitrios Apostolou Date: Wed, 11 Sep 2019 19:24:25 +0200 Subject: [PATCH 089/105] Refactor DownloadURL.sh MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Auto-detects and verifies all kinds of hashes, not only SHA1. Hash verification is now an autonomous function. If the file is found at the destination, skip redownloading it if the hash is OK. Runs on POSIX sh, not requiring bash. Retain compatibility with previous version. Change-Id: I9930336030aa776f49dc460fe766f3e831700255 Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/unix/DownloadURL.sh | 84 ++++++++++++++------ 1 file changed, 61 insertions(+), 23 deletions(-) diff --git a/coin/provisioning/common/unix/DownloadURL.sh b/coin/provisioning/common/unix/DownloadURL.sh index 996c99da..da6d772f 100755 --- a/coin/provisioning/common/unix/DownloadURL.sh +++ b/coin/provisioning/common/unix/DownloadURL.sh @@ -1,8 +1,8 @@ -#!/usr/bin/env bash +#!/bin/sh ############################################################################# ## -## Copyright (C) 2017 The Qt Company Ltd. +## Copyright (C) 2019 The Qt Company Ltd. ## Contact: http://www.qt.io/licensing/ ## ## This file is part of the provisioning scripts of the Qt Toolkit. @@ -33,31 +33,69 @@ ## ############################################################################# + # 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. +# URL. Also the SHA is checked for the file (SHA algorithm is autodetected +# based on the SHA length). Target filename should also be given. -set -ex +############################ BOILERPLATE ############################### +command -v sha1sum >/dev/null || alias sha1sum='shasum -a 1' +command -v sha256sum >/dev/null || alias sha256sum='shasum -a 256' +command -v sha384sum >/dev/null || alias sha384sum='shasum -a 384' +command -v sha512sum >/dev/null || alias sha512sum='shasum -a 512' +######################################################################## -function DownloadURL { - url=$1 - url_alt=$2 - expectedSha1=$3 - targetFile=$4 - echo "Downloading from primary URL '$url'" - curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url" || { - echo "Failed to download '$url' multiple times" - echo "Downloading from alternative URL '$url_alt'" - curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url_alt" || { echo 'Failed to download even from alternative url'; exit 1; } - } +VerifyHash () { + file=$1 + expectedHash=$2 - echo "Checking SHA1 on PKG '$targetFile'" - echo "$expectedSha1 *$targetFile" > "$targetFile.sha1" - sha1sum --check "$targetFile.sha1" - rm -f "$targetFile.sha1" + if [ ! -f "$file" ] + then return 2 # file does not exist + fi + + + hashLength="$(echo "$expectedHash" | wc -c | sed 's/ *//g')" + # Use backticks because of bug with bash-3 (default on macOS), + # caused when there are unbalanced parentheses inside $() + # shellcheck disable=SC2006 + hash=`case "$hashLength" in + 41) sha1sum "$file" ;; + 65) sha256sum "$file" ;; + 97) sha384sum "$file" ;; + 129) sha512sum "$file" ;; + *) echo "FATAL! Unknown hash length: $hashLength" 1>&2 && exit 1 ;; + esac | cut -d ' ' -f 1` + + if [ ! "$expectedHash" = "$hash" ] + then + echo "FAIL! wrong file hash: $file $hash" 1>&2 + return 1 + fi + echo "OK verified integrity of: $file" } +# Check if file already exists and is good, otherwise download it +DownloadURL () { + url=$1 + url2=$2 + expectedHash=$3 + targetFile=$4 + + if VerifyHash "$targetFile" "$expectedHash" + then + echo "Skipping download, found and validated existing file: $targetFile" + else + echo "Downloading from primary URL: $url" + if ! curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url" + then + echo "FAIL! to download, trying alternative URL: $url2" 1>&2 + if ! curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url2" + then + echo 'FAIL! to download even from alternative url' 1>&2 + return 1 + fi + fi + VerifyHash "$targetFile" "$expectedHash" + fi +} From fbe3a8d84e943b8e1ff89389bc6af9e09532722a Mon Sep 17 00:00:00 2001 From: Dimitrios Apostolou Date: Wed, 24 Jul 2019 16:17:46 +0200 Subject: [PATCH 090/105] Install telegraf on all provisioned VMs Install binaries as early as possible in the provisioning process, and start them, in order to monitor provisioning too. To achieve this, some OS auto-detection logic is introduced in shell script common.sourced.sh. The script can be sourced and used in all kind of other generic scripts. ioping is also installed from custom-compiled binaries in order to monitor the disk latency of the VMs. Reason we don't use ioping from the repositories, is that the units differ between ioping versions (new ioping reports latencies in nanoseconds, old in microseconds). Fixes: QTQAINFRA-3092 Change-Id: I9d9afb791955725d4bd0b32dae97dfc0bd4a76a3 Reviewed-by: Heikki Halmet --- .../devel_languages_go.SUSE_repo_key.pub | 19 +++ .../common/linux/telegraf-coin.conf | 47 ++++++ .../common/macos/telegraf-coin.conf | 51 +++++++ .../shared/telegraf/influxdb.repo_key.pub | 52 +++++++ .../common/shared/telegraf/telegraf-ioping.sh | 26 ++++ .../telegraf/telegraf_packages.sha256.txt | 6 + .../common/unix/common.sourced.sh | 139 ++++++++++++++++++ .../common/unix/telegraf_install.sh | 98 ++++++++++++ .../common/unix/telegraf_password.sh | 60 ++++++++ coin/provisioning/common/windows/helpers.ps1 | 2 +- .../common/windows/install_telegraf.ps1 | 68 +++++++++ .../common/windows/telegraf-coin.conf | 41 ++++++ .../common/windows/telegraf_password.ps1 | 39 +++++ .../04-install_telegraf.sh | 3 + .../04-install_telegraf.sh | 3 + .../04-install_telegraf.sh | 3 + .../04-install_telegraf.sh | 3 + .../04-install_telegraf.sh | 3 + .../04-install_telegraf.sh | 3 + .../04-install_telegraf.sh | 3 + .../04-install_telegraf.sh | 3 + .../26-install_telegraf.sh | 3 + .../26-install_telegraf.sh | 3 + .../26-install_telegraf.sh | 3 + .../05-install_telegraf.ps1 | 1 + .../05-install_telegraf.ps1 | 1 + .../05-install_telegraf.ps1 | 1 + .../05-install_telegraf.ps1 | 1 + .../05-install_telegraf.ps1 | 1 + .../05-install_telegraf.ps1 | 1 + 30 files changed, 686 insertions(+), 1 deletion(-) create mode 100644 coin/provisioning/common/linux/devel_languages_go.SUSE_repo_key.pub create mode 100644 coin/provisioning/common/linux/telegraf-coin.conf create mode 100644 coin/provisioning/common/macos/telegraf-coin.conf create mode 100644 coin/provisioning/common/shared/telegraf/influxdb.repo_key.pub create mode 100644 coin/provisioning/common/shared/telegraf/telegraf-ioping.sh create mode 100644 coin/provisioning/common/shared/telegraf/telegraf_packages.sha256.txt create mode 100644 coin/provisioning/common/unix/common.sourced.sh create mode 100755 coin/provisioning/common/unix/telegraf_install.sh create mode 100755 coin/provisioning/common/unix/telegraf_password.sh create mode 100644 coin/provisioning/common/windows/install_telegraf.ps1 create mode 100644 coin/provisioning/common/windows/telegraf-coin.conf create mode 100644 coin/provisioning/common/windows/telegraf_password.ps1 create mode 100755 coin/provisioning/qtci-linux-RHEL-6.6-x86_64/04-install_telegraf.sh create mode 100755 coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install_telegraf.sh create mode 100755 coin/provisioning/qtci-linux-SLES-12-x86_64/04-install_telegraf.sh create mode 100755 coin/provisioning/qtci-linux-SLES-15-x86_64/04-install_telegraf.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-16.04-x86/04-install_telegraf.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-install_telegraf.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-install_telegraf.sh create mode 100755 coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/04-install_telegraf.sh create mode 100755 coin/provisioning/qtci-macos-10.12-x86_64/26-install_telegraf.sh create mode 100755 coin/provisioning/qtci-macos-10.13-x86_64/26-install_telegraf.sh create mode 100755 coin/provisioning/qtci-macos-10.14-x86_64/26-install_telegraf.sh create mode 100644 coin/provisioning/qtci-windows-10-x86/05-install_telegraf.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/05-install_telegraf.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86/05-install_telegraf.ps1 create mode 100644 coin/provisioning/qtci-windows-7-x86_64/05-install_telegraf.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86/05-install_telegraf.ps1 create mode 100644 coin/provisioning/qtci-windows-8.1-x86_64/05-install_telegraf.ps1 diff --git a/coin/provisioning/common/linux/devel_languages_go.SUSE_repo_key.pub b/coin/provisioning/common/linux/devel_languages_go.SUSE_repo_key.pub new file mode 100644 index 00000000..48162c56 --- /dev/null +++ b/coin/provisioning/common/linux/devel_languages_go.SUSE_repo_key.pub @@ -0,0 +1,19 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.5 (GNU/Linux) + +mQGiBEyvJq8RBAD64FtKbU3VFsZ4PAzcSi9rETc1qXZLVQYtrE38niriIJUuT/tC +kxGjkduD7ozP6rxL+M8fk9UdbbmzhHhXzQT2blyYy2iwpZP5+AFeQawz+oyMRVze +x6IY5qO31TiRu+aEBptk6nco4DULlKABlvtjKI+gJ4buJm+TumyrPaxe9wCgpFwl +O0fEjpOfQd+6Du0sCnPX7+8D/3xYVj9q5ILmrJ9zehBKjRYEcaP0rZVqudH51FUS +I0LQNHsJdzKLzhT+Zj7TJU4KnCN4sX7amfYL3GT9qyZEBDx2alubvEsI36wtNq0i +ewU4XmyZ+Rd7Q4mAPNoBGe5DsUA8wn/7iHGg9aJHu+GXvH7T3DVoUxW5W2KqPw+h +jzqGBACWGuuCefa683uf6aKqpTS3JB+01BDPf+sG9qJ+k7xcJOsEiXIe1X5vH9ov +kEvTM12kzY7SGwlsFsTDT1xioDl62g5nPlZMXErUBVnjoMtjl9bDwUPJY/vP1S9M +VaONBMoJEON3HRui9jhdEK25LTdrcFlFpRzJI3AgdXwy8aQyiLRGZGV2ZWw6bGFu +Z3VhZ2VzOmdvIE9CUyBQcm9qZWN0IDxkZXZlbDpsYW5ndWFnZXM6Z29AYnVpbGQu +b3BlbnN1c2Uub3JnPohmBBMRAgAmBQJc9DoCAhsDBQkUY8NTBgsJCAcDAgQVAggD +BBYCAwECHgECF4AACgkQr0z+TTB9e/lQZgCfXIjj30HyCPvUbSbSd6zOS0seAegA +n3DXayMpRphNmyJgLvl5qKfsX7f6iEYEExECAAYFAkyvJq8ACgkQOzARt2udZSOg +qQCeOba7kjk7CI+64GOkhhTGSdjnjdQAn2IC5tx+PW38XKwl3Jr5YVp0RyR0 +=AOj6 +-----END PGP PUBLIC KEY BLOCK----- diff --git a/coin/provisioning/common/linux/telegraf-coin.conf b/coin/provisioning/common/linux/telegraf-coin.conf new file mode 100644 index 00000000..33a9c6de --- /dev/null +++ b/coin/provisioning/common/linux/telegraf-coin.conf @@ -0,0 +1,47 @@ +[global_tags] +[agent] + interval = "10s" + round_interval = true + metric_batch_size = 100 + metric_buffer_limit = 10000 + collection_jitter = "0s" + flush_interval = "10s" + flush_jitter = "5s" + precision = "" + logfile = "/var/log/telegraf-coin.log" + hostname = "$COIN_UNIQUE_JOB_ID" + omit_hostname = false +[[outputs.influxdb]] + urls= ["https://qtinfluxdb01.intra.qt.io:8086"] + insecure_skip_verify = true + database = "coin_vms" + skip_database_creation = true + username = "coin_vms_writer" + password = "COIN_VMS_WRITER_PASS" +[[inputs.cpu]] + percpu = true + totalcpu = true + collect_cpu_time = false + report_active = false +[[inputs.disk]] + ignore_fs = ["tmpfs", "devtmpfs", "devfs", "iso9660", "overlay", "aufs", "squashfs"] +[[inputs.diskio]] +[[inputs.kernel]] +[[inputs.mem]] +[[inputs.processes]] +[[inputs.swap]] +[[inputs.system]] +[[inputs.kernel_vmstat]] # linux-only +[[inputs.netstat]] + + +# Monitor Coin process +[[inputs.procstat]] + exe = "coin-" + pid_finder = "native" + + +# Monitor I/O latency +[[inputs.exec]] + data_format = "influx" + commands = [ "/usr/bin/telegraf-ioping.sh /" ] diff --git a/coin/provisioning/common/macos/telegraf-coin.conf b/coin/provisioning/common/macos/telegraf-coin.conf new file mode 100644 index 00000000..24440a05 --- /dev/null +++ b/coin/provisioning/common/macos/telegraf-coin.conf @@ -0,0 +1,51 @@ +[global_tags] +[agent] + interval = "10s" + round_interval = true + metric_batch_size = 100 + metric_buffer_limit = 10000 + collection_jitter = "0s" + flush_interval = "10s" + flush_jitter = "5s" + precision = "" + logfile = "/var/log/telegraf-coin.log" + hostname = "$COIN_UNIQUE_JOB_ID" + omit_hostname = false +[[outputs.influxdb]] + urls= ["https://qtinfluxdb01.intra.qt.io:8086"] + insecure_skip_verify = true + database = "coin_vms" + skip_database_creation = true + username = "coin_vms_writer" + password = "COIN_VMS_WRITER_PASS" +#[[inputs.cpu]] # linux-only +# percpu = true +# totalcpu = true +# collect_cpu_time = false +# report_active = false +[[inputs.disk]] + ignore_fs = ["tmpfs", "devtmpfs", "devfs", "iso9660", "overlay", "aufs", "squashfs"] +#[[inputs.diskio]] # linux-only +[[inputs.kernel]] +[[inputs.mem]] +[[inputs.processes]] +[[inputs.swap]] +[[inputs.system]] +#[[inputs.kernel_vmstat]] # linux-only +[[inputs.netstat]] + + +# Monitor Coin process +[[inputs.procstat]] + exe = "coin-" + # Buggy on macOS if using the "native" pid_finder, see: + # https://github.com/influxdata/telegraf/issues/6265 + # Tested 1.12.1 version that "native" pid_finder has been fixed, + # but it is slow and times out frequently + pid_finder = "pgrep" + + +# Monitor I/O latency +[[inputs.exec]] + data_format = "influx" + commands = [ "/usr/bin/telegraf-ioping.sh /" ] diff --git a/coin/provisioning/common/shared/telegraf/influxdb.repo_key.pub b/coin/provisioning/common/shared/telegraf/influxdb.repo_key.pub new file mode 100644 index 00000000..c97d5933 --- /dev/null +++ b/coin/provisioning/common/shared/telegraf/influxdb.repo_key.pub @@ -0,0 +1,52 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1 + +mQINBFYJmwQBEADCw7mob8Vzk+DmkYyiv0dTU/xgoSlp4SQwrTzat8MB8jxmx60l +QjmhqEyuB8ho4zzZF9KV+gJWrG6Rj4t69JMTJWM7jFz+0B1PC7kJfNM+VcBmkTnj +fP+KJjqz50ETnsF0kQTG++UJeRYjG1dDK0JQNQJAM6NQpIWJI339lcDf15vzrMnb +OgIlNxV6j1ZZqkle4fvScF1NQxYScRiL+sRgVx92SI4SyD/xZnVGD/szB+4OCzah ++0Q/MnNGV6TtN0RiCDZjIUYiHoeT9iQXEONKf7T62T4zUafO734HyqGvht93MLVU +GQAeuyx0ikGsULfOsJfBmb3XJS9u+16v7oPFt5WIbeyyNuhUu0ocK/PKt5sPYR4u +ouPq6Ls3RY3BGCH9DpokcYsdalo51NMrMdnYwdkeq9MEpsEKrKIN5ke7fk4weamJ +BiLI/bTcfM7Fy5r4ghdI9Ksw/ULXLm4GNabkIOSfT7UjTzcBDOvWfKRBLX4qvsx4 +YzA5kR+nX85u6I7W10aSqBiaLqk6vCj0QmBmCjlSeYqNQqSzH/6OoL6FZ7lP6AiG +F2NyGveJKjugoXlreLEhOYp20F81PNwlRBCAlMC2Q9mpcFu0dtAriVoG4gVDdYn5 +t+BiGfD2rJlCinYLgYBDpTPcdRT3VKHWqL9fcC4HKmic0mwWg9homx550wARAQAB +tDFJbmZsdXhEQiBQYWNrYWdpbmcgU2VydmljZSA8c3VwcG9ydEBpbmZsdXhkYi5j +b20+iQI3BBMBCgAhBQJWCZsEAhsDBQsJCAcDBRUKCQgLBRYDAgEAAh4BAheAAAoJ +EGhKFM8lguDF9XEQAK9rREnZt6ujh7GXfeNki35bkn39q8GYh0mouShFbFY9o0i3 +UJVChsxokJSRPgFh9GOhOPTupl3rzfdpD+IlWI2Myt6han2HOjZKNZ4RGNrYJ5UR +uxt4dKMWlMbpkzL56bhHlx97RoXKv2d2zRQfw9nyZb6t3lw2k2kKXsMxjGa0agM+ +2SropwYOXdtkz8UWaGd3LYxwEvW3AuhI8EEEHdLetQaYe9sANDvUEofgFbdsuICH +9QLmbYavk7wyGTPBKfPBbeyTxwW2rMUnFCNccMKLm1i5NpZYineBtQbX2cfx9Xsk +1JLOzEBmNal53H2ob0kjev6ufzOD3s8hLu4KMCivbIz4YT3fZyeExn0/0lUtsQ56 +5fCxE983+ygDzKsCnfdXqm3GgjaI90OkNr1y4gWbcd5hicVDv5fD3TD9f0GbpDVw +yDz8YmvNzxMILt5Glisr6aH7gLG/u8jxy0D8YcBiyv5kfY4vMI2yXHpGg1cn/sVu +ZB01sU09VVIM2BznnimyAayI430wquxkZCyMx//BqFM1qetIgk1wDZTlFd0n6qtA +fDmXAC4s5pM5rfM5V57WmPaIqnRIaESJ35tFUFlCHfkfl/N/ribGVDg1z2KDW08r +96oEiIIiV4GfXl+NprJqpNS3Cn+aCXtd7/TsDScDEgs4sMaR29Lsf26cuWk8uQIN +BFYJmwQBEADDPi3fmwn6iwkiDcH2E2V31cHlBw9OdJfxKVUdyAQEhTtqmG9P8XFZ +ERRQF155XLQPLvRlUlq7vEYSROn5J6BAnsjdjsH9LmFMOEV8CIRCRIDePG/Mez2d +nIK5yiU6GkS3IFaQg2T9/tOBKxm0ZJPfqTXbT4jFSfvYJ3oUqc+AyYxtb8gj1GRk +X283/86/bA3C98u7re1vPtiDRyM8r0+lhEc59Yx/EAOL+X2gZyTgyUoH+LLuOWQK +s1egI8y80R8NZfM1nMiQk2ywMsTFwQjSVimScvzqv5Nt8k8CvHUQ3a6R+6doXGNX +5RnUqn9Qvmh0JY5sNgFsoaGbuk2PJrVaGBRnfnjaDqAlZpDhwkWhcCcguNhRbRHp +N7/a0pQr70bAG9VikzLyGC17EU0sxney/hyNHkr4Uyy2OXHpuJvRjVKy/BwZ3fxA +AYX2oZIOxQB3/OulzO/DppaCVhRtp1bt+Z5f+fpisiVb5DvZcMdeyAoQ4+oOr7v3 +EasIs2XYcQ+kOE3Y2kdlHWBeuXzxgWgJZ1OOpwGMjR3Uy6IwhuSWtreJBA4er+Df +vgSPwKBsRLNLbPe3ftjArnC5GfMiGgikVdAUdN4OkEqvUbkRoAVGKTOMLUKm+ZkG +OskJOVYS+JAina0qkYEFF7haycMjf9olhqLmTIC+6X7Ox9R2plaOhQARAQABiQIf +BBgBCgAJBQJWCZsEAhsMAAoJEGhKFM8lguDF8ZIP/1q9Sdz8oMvf9AJXZ7AYxm77 +V+kJzJqi62nZLWJnrFXDZJpU+LkYlb3fstsZ1rvBhnrEPSmFxoj72CP0RtcyX7wJ +dA7K1Fl9LpJi5H8300cC7UyG94MUYbrXijbLTbnFTfNr1tGx4a1T/7Yyxx/wZGrT +H/X8cvNybkl33SxDdlQQ9kx3lFOwC41e3TkGsUWxn3TCfvDh8VdA6Py6JeSPFGOb +MEO2/q7oUgvjfV+ivN5ayZi9bWgeqm1sgtmTHHQ4RqwwKrAb5ynXpn1b9QrkevgT +b91uzMA22Prl4DuzKiaMYDcZOQ3vtf0eFBP0GOSSgUKS4bQ3dGgi1JmQ7VuAM4uj ++Ug5TnGoLwclTwLksc7v89C5MMPgm2vVXvCUDzyzQA7bIHFeX+Rziby4nymec4Nr +eeXYNBJWrEp8XR7UNWmEgroXRoN1x9/6esh5pnoUXGAIWuKzSLQM70/wWxS67+v2 +aC1GNb+pXXAzYeIIiyLWaZwCSr8sWMvshFT9REk2+lnb6sAeJswQtfTUWI00mVqZ +dvI3Wys2h0IyIejuwetTUvGhr9VgpqiLLfGzGlt/y2sg27wdHzSJbMh0VrVAK26/ +BlvEwWDCFT0ZJUMG9Lvre25DD0ycbougLsRYjzmGb/3k3UktS3XTCxyBa/k3TPw3 +vqIHrEqk446nGPDqJPS5 +=9iF7 +-----END PGP PUBLIC KEY BLOCK----- diff --git a/coin/provisioning/common/shared/telegraf/telegraf-ioping.sh b/coin/provisioning/common/shared/telegraf/telegraf-ioping.sh new file mode 100644 index 00000000..ad95eadc --- /dev/null +++ b/coin/provisioning/common/shared/telegraf/telegraf-ioping.sh @@ -0,0 +1,26 @@ +#!/bin/sh + +# Measure I/O latency once, return data in InfluxDB format +# +# Run one ioping command for read, and one for write. +# Each one sends 3 requests and reports the minimum time, in nanoseconds. +# (Because of limitations of ioping, we can't just send one request and get +# the number back in the batch format. Additionally, the number seems to be +# fluctuating quite a bit so taking the smallest number out of 3 requests is +# stabilising it a bit.) + + +set -e + +[ x"$1" = x ] && echo "$0 takes a path as a first argument" && exit 1 + +# Try to run in high priority to avoid slow-downs because of +# factors other than I/O. +renice -n -10 -p $$ >/dev/null 2>&1 || true + + +rlatency="$(ioping -B -k -c 3 -i 0.1 "$1" | cut -d " " -f 5)" +wlatency="$(ioping -B -k -c 3 -i 0.1 -W "$1" | cut -d " " -f 5)" + +printf "ioping,path=$1 read_latency_ns=%u,write_latency_ns=%u\n" \ + $rlatency $wlatency diff --git a/coin/provisioning/common/shared/telegraf/telegraf_packages.sha256.txt b/coin/provisioning/common/shared/telegraf/telegraf_packages.sha256.txt new file mode 100644 index 00000000..7d1cdada --- /dev/null +++ b/coin/provisioning/common/shared/telegraf/telegraf_packages.sha256.txt @@ -0,0 +1,6 @@ +https://dl.influxdata.com/telegraf/releases/telegraf-1.12.1_windows_i386.zip d2dea67a28fd7a9e21395d14f0b7ce1b6413e85cc9ffd89cc7ff8f35e8af5837 +https://dl.influxdata.com/telegraf/releases/telegraf-1.12.1_windows_amd64.zip 88d8c8146b561f43726e61688b42d0b5ab88fc22607b94df5a2c8245bbb27e29 +https://dl.influxdata.com/telegraf/releases/telegraf-1.12.1_darwin_amd64.tar.gz 58a2b294c1b6408c396b5526719cf7cad557f7075fed10ff0b2a74141ea2d629 +https://dl.influxdata.com/telegraf/releases/telegraf-1.12.1_linux_amd64.tar.gz 070a76800d1a5f33413b8948286f75caa55ebd924f6fb6996a753b9979799ef5 +https://dl.influxdata.com/telegraf/releases/telegraf-1.12.1_linux_i386.tar.gz 964077b6846708f579a100d7ea6090e2d8350ace75ec735d539bc452bc551038 +https://dl.influxdata.com/telegraf/releases/telegraf-1.12.1-static_linux_amd64.tar.gz bb03814c99c037ce0758e3884660910f2f6fd78f3d49a8e1ef531693b3cfe25d diff --git a/coin/provisioning/common/unix/common.sourced.sh b/coin/provisioning/common/unix/common.sourced.sh new file mode 100644 index 00000000..a52880b2 --- /dev/null +++ b/coin/provisioning/common/unix/common.sourced.sh @@ -0,0 +1,139 @@ +#!/bin/sh + + +############################################################################# +## +## Copyright (C) 2019 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$ +## +############################################################################# + + +# Script to be sourced from everywhere you need a common environment. Defines: +export PROVISIONING_DIR +export PROVISIONING_OS +export PROVISIONING_OS_ID +export PROVISIONING_ARCH +export CMD_PKG_INSTALL +export CMD_PKG_LOCALINSTALL +export CMD_INSTALL + + + +if [ x"$IS_PROVISIONING_COMMON_SOURCED" != x ] +then + echo "common.sourced.sh has already been sourced, re-sourcing skipped" + return +fi + +# Do not export; you want children to re-source, because they only inherit the +# variables but not the functions +IS_PROVISIONING_COMMON_SOURCED=1 + + +fatal () { + echo "$1" 1>&2 + if [ x"$2" != x ] + then exit "$2" + else exit + fi +} + +is_script_executed () { + [ x"$(basename "$0")" = x"$1" ] +} + + +is_script_executed common.sourced.sh \ + && fatal "Script common.sourced.sh should always be sourced, not executed" + + +set_common_environment () { + # Unfortunately we can't find the provisioning directory from a sourced + # script in a portable way + # PROVISIONING_DIR="$(dirname "$0")/../../" + + [ x"$PROVISIONING_DIR" = x ] \ + && fatal "PROVISIONING_DIR variable needs to be set before calling set_common_environment" + + uname_s="$(uname -s)" + case "$uname_s" in + Linux) + PROVISIONING_OS=linux + . /etc/os-release + PROVISIONING_OS_ID="$ID" + case "$PROVISIONING_OS_ID" in + suse|sles|opensuse*) + CMD_PKG_INSTALL="sudo zypper -nq install" + CMD_PKG_LOCALINSTALL="sudo zypper --no-gpg-checks -nq install" + ;; + debian|ubuntu) + CMD_PKG_INSTALL="sudo apt -y install" + CMD_PKG_LOCALINSTALL="sudo apt -y install" + ;; + rhel|centos|fedora) + CMD_PKG_INSTALL="sudo yum -y install" + CMD_PKG_LOCALINSTALL="sudo yum -y --nogpgcheck localinstall" + ;; + *) fatal "Unknown ID in /etc/os-release: $PROVISIONING_OS_ID" ;; + esac + ;; + Darwin) + PROVISIONING_OS=macos + PROVISIONING_OS_ID=macos + CMD_PKG_INSTALL="brew install" + CMD_PKG_LOCALINSTALL="echo 'TODO how to install a package file on macOS'" + ;; + *) + fatal "Unknown system in uname: $uname_s" 42 + ;; + esac + + uname_m="$(uname -m)" + case "$uname_m" in + x86_64|amd64) PROVISIONING_ARCH=amd64 ;; + i[3456]86) PROVISIONING_ARCH=x86 ;; + *) fatal "Unknown architecture in uname: $uname_m" 43 ;; + esac + + CMD_INSTALL="sudo install" +} + +set_common_environment + +set_dry_run () { + if [ x"$PROVISIONING_DRY_RUN" != x ] + then + CMD_PKG_INSTALL="echo DRYRUN: $CMD_PKG_INSTALL" + CMD_PKG_LOCALINSTALL="echo DRYRUN: $CMD_PKG_LOCALINSTALL" + CMD_INSTALL="echo DRYRUN: $CMD_INSTALL" + fi +} + +set_dry_run diff --git a/coin/provisioning/common/unix/telegraf_install.sh b/coin/provisioning/common/unix/telegraf_install.sh new file mode 100755 index 00000000..1412650e --- /dev/null +++ b/coin/provisioning/common/unix/telegraf_install.sh @@ -0,0 +1,98 @@ +#!/bin/sh + +############################################################################# +## +## Copyright (C) 2019 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 installs telegraf and ioping and our script telegraf-ioping.sh +# to the /usr/bin directory. +# +# The reasons we don't install to /usr/local/bin are: +# 1. On SLES and RHEL, the PATH of sudo (secure_path setting in /etc/sudoers) +# does not include /usr/local/bin. +# 2. On macOS /usr/local/bin does not even exist early in provisioning. + + +######################## BOILERPLATE ########################### +set -e + + +PROVISIONING_DIR="$(dirname "$0")/../../" +. "$PROVISIONING_DIR"/common/unix/common.sourced.sh + +. "$PROVISIONING_DIR"/common/unix/DownloadURL.sh + +is_script_executed telegraf_install.sh \ + || fatal "Script telegraf_install.sh should be executed, not sourced" + +################################################################ + + +[ "$PROVISIONING_OS" = linux ] \ + && ioping_sha256=259abf04bcb84f4126ff97c04b6651e1cf5ea6d8a9ff364c769a26c95b6eeb44 \ + || ioping_sha256=55de6a2f1a5343e0ce8df31d82d47a9e79c7e612edbc6dfb39b5fc6fb358b2e3 +DownloadURL "http://ci-files01-hki.intra.qt.io/input/ioping/ioping.${PROVISIONING_OS}-${PROVISIONING_ARCH}" \ + '' "$ioping_sha256" ioping +$CMD_INSTALL -m 755 ./ioping /usr/bin/ +rm -f ioping + +# 2. Install custom ioping monitoring script +$CMD_INSTALL -m 755 "$PROVISIONING_DIR"/common/shared/telegraf/telegraf-ioping.sh /usr/bin/ + +# 3. Download and install telegraf + +[ x"$PROVISIONING_OS" = xmacos ] && os=darwin || os=linux +[ x"$PROVISIONING_ARCH" = xx86 ] && arch=i386 || arch=amd64 +package_filename=telegraf-1.12.1_${os}_${arch}.tar.gz +package_sha256_list="$PROVISIONING_DIR"/common/shared/telegraf/telegraf_packages.sha256.txt +package_sha256=$(sed -n "s/.*$package_filename *//p" "$package_sha256_list") + +DownloadURL \ + http://ci-files01-hki.intra.qt.io/input/telegraf/"$package_filename" \ + https://dl.influxdata.com/telegraf/releases/"$package_filename" \ + "$package_sha256" \ + telegraf.tar.gz + +tar -xzf ./telegraf.tar.gz -C /tmp +telegraf_binary=$(find /tmp/telegraf* -name telegraf -type f | grep /bin/ | head -1) +$CMD_INSTALL -m 755 "$telegraf_binary" /usr/bin/ +rm -rf /tmp/telegraf* + +# 4. Edit config file with passwords +"$PROVISIONING_DIR"/common/unix/telegraf_password.sh + +# 5. Start telegraf in background (-b) and with retaining the environment (-E) +# in order to report as hostname = $COIN_UNIQUE_JOB_ID. +/usr/bin/sudo -b -E telegraf --config /etc/telegraf-coin.conf >/dev/null 2>&1 + +echo DONE: "Installed and started telegraf: $package_filename" diff --git a/coin/provisioning/common/unix/telegraf_password.sh b/coin/provisioning/common/unix/telegraf_password.sh new file mode 100755 index 00000000..efbed142 --- /dev/null +++ b/coin/provisioning/common/unix/telegraf_password.sh @@ -0,0 +1,60 @@ +#!/bin/sh + +############################################################################# +## +## Copyright (C) 2019 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$ +## +############################################################################# + + +######################## BOILERPLATE ########################### +set -e + + +PROVISIONING_DIR="$(dirname "$0")/../../" +. "$PROVISIONING_DIR"/common/unix/common.sourced.sh + +is_script_executed telegraf_password.sh \ + || fatal "Script telegraf_password.sh should be executed, not sourced, to avoid leaking secrets in the logs" +# Avoid leaking secrets in the logs +set +x +################################################################ + + +# Provisioning should run even without the secrets repository +influxdb_password=$(cut -d : -f 2 ~qt/work/influxdb/coin_vms_writer.auth) \ + || influxdb_password=no_password_provided + +rm -f ~qt/work/influxdb/coin_vms_writer.auth +sed "s|COIN_VMS_WRITER_PASS|$influxdb_password|" \ + "$PROVISIONING_DIR"/common/"$PROVISIONING_OS"/telegraf-coin.conf \ + > .telegraf-coin.conf.final +$CMD_INSTALL -m 600 .telegraf-coin.conf.final /etc/telegraf-coin.conf +rm -f .telegraf-coin.conf.final diff --git a/coin/provisioning/common/windows/helpers.ps1 b/coin/provisioning/common/windows/helpers.ps1 index 0f39beed..3ccb42ac 100644 --- a/coin/provisioning/common/windows/helpers.ps1 +++ b/coin/provisioning/common/windows/helpers.ps1 @@ -3,7 +3,7 @@ function Verify-Checksum Param ( [string]$File=$(throw("You must specify a filename to get the checksum of.")), [string]$Expected=$(throw("Checksum required")), - [ValidateSet("sha1","md5")][string]$Algorithm="sha1" + [ValidateSet("sha256","sha1","md5")][string]$Algorithm="sha1" ) Write-Host "Verifying checksum of $File" $fs = new-object System.IO.FileStream $File, "Open" diff --git a/coin/provisioning/common/windows/install_telegraf.ps1 b/coin/provisioning/common/windows/install_telegraf.ps1 new file mode 100644 index 00000000..258c6c59 --- /dev/null +++ b/coin/provisioning/common/windows/install_telegraf.ps1 @@ -0,0 +1,68 @@ +############################################################################# +## +## Copyright (C) 2019 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$ +## +############################################################################# + +. "$PSScriptRoot\..\..\common\windows\helpers.ps1" + + +# Install a specific version of Telegraf +# https://github.com/influxdata/telegraf/releases + +$version = "1.12.1" + +if (Is64BitWinHost) { + $arch = "amd64" + $sha256 = "88d8c8146b561f43726e61688b42d0b5ab88fc22607b94df5a2c8245bbb27e29" +} else { + $arch = "i386" + $sha256 = "d2dea67a28fd7a9e21395d14f0b7ce1b6413e85cc9ffd89cc7ff8f35e8af5837" +} + +$filename = "telegraf-" + $version + "_windows_" + $arch + ".zip" + +$url_cache = "\\ci-files01-hki.intra.qt.io\provisioning\windows\" + $filename +$url_official = "https://dl.influxdata.com/telegraf/releases/" + $filename +$tempfile = "C:\Windows\Temp\" + $filename + +Write-Host "Fetching Telegraf $version..." +Download $url_official $url_cache $tempfile +Verify-Checksum $tempfile $sha256 sha256 + +Write-Host "Installing telegraf.exe under C:\Utils\telegraf" +Extract-7Zip $tempfile C:\Utils "telegraf" +Copy-Item "$PSScriptRoot\..\..\common\windows\telegraf-coin.conf" C:\telegraf-coin.conf + +. "$PSScriptRoot\telegraf_password.ps1" + +Start-Process -FilePath C:\Utils\telegraf\telegraf.exe -ArgumentList "--config C:\telegraf-coin.conf" + +Write-Output "Telegraf = $version" >> ~\versions.txt diff --git a/coin/provisioning/common/windows/telegraf-coin.conf b/coin/provisioning/common/windows/telegraf-coin.conf new file mode 100644 index 00000000..9a4d22e8 --- /dev/null +++ b/coin/provisioning/common/windows/telegraf-coin.conf @@ -0,0 +1,41 @@ +[global_tags] +[agent] + interval = "10s" + round_interval = true + metric_batch_size = 100 + metric_buffer_limit = 10000 + collection_jitter = "0s" + flush_interval = "10s" + flush_jitter = "5s" + precision = "" + logfile = "C:\\telegraf-coin.log" + hostname = "$COIN_UNIQUE_JOB_ID" + omit_hostname = false +[[outputs.influxdb]] + urls= ["https://qtinfluxdb01.intra.qt.io:8086"] + insecure_skip_verify = true + database = "coin_vms" + skip_database_creation = true + username = "coin_vms_writer" + password = "COIN_VMS_WRITER_PASS" +[[inputs.cpu]] + percpu = true + totalcpu = true + collect_cpu_time = false + report_active = false +[[inputs.disk]] + ignore_fs = ["tmpfs", "devtmpfs", "devfs", "iso9660", "overlay", "aufs", "squashfs"] +[[inputs.diskio]] +[[inputs.kernel]] +[[inputs.mem]] +#[[inputs.processes]] +[[inputs.swap]] +[[inputs.system]] +#[[inputs.kernel_vmstat]] # linux-only +[[inputs.netstat]] + + +# Monitor Coin process +[[inputs.procstat]] + exe = "coin-" + pid_finder = "native" diff --git a/coin/provisioning/common/windows/telegraf_password.ps1 b/coin/provisioning/common/windows/telegraf_password.ps1 new file mode 100644 index 00000000..11d04dbc --- /dev/null +++ b/coin/provisioning/common/windows/telegraf_password.ps1 @@ -0,0 +1,39 @@ +############################################################################# +## +## Copyright (C) 2019 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$ +## +############################################################################# + + +$colon_file = Get-Content "C:\Users\qt\work\influxdb\coin_vms_writer.auth" +$influxdb_password = $colon_file.Substring($colon_file.LastIndexOf(':') + 1) +$telegraf_conf = "C:\telegraf-coin.conf" +(Get-Content $telegraf_conf) | ForEach-Object { $_.Replace("COIN_VMS_WRITER_PASS", $influxdb_password) } | Out-File -Encoding UTF8 $telegraf_conf +Remove-Item "C:\Users\qt\work\influxdb\coin_vms_writer.auth" diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/04-install_telegraf.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/04-install_telegraf.sh new file mode 100755 index 00000000..729f9003 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/04-install_telegraf.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/unix/telegraf_install.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install_telegraf.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install_telegraf.sh new file mode 100755 index 00000000..729f9003 --- /dev/null +++ b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install_telegraf.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/unix/telegraf_install.sh diff --git a/coin/provisioning/qtci-linux-SLES-12-x86_64/04-install_telegraf.sh b/coin/provisioning/qtci-linux-SLES-12-x86_64/04-install_telegraf.sh new file mode 100755 index 00000000..729f9003 --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-12-x86_64/04-install_telegraf.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/unix/telegraf_install.sh diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/04-install_telegraf.sh b/coin/provisioning/qtci-linux-SLES-15-x86_64/04-install_telegraf.sh new file mode 100755 index 00000000..729f9003 --- /dev/null +++ b/coin/provisioning/qtci-linux-SLES-15-x86_64/04-install_telegraf.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/unix/telegraf_install.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/04-install_telegraf.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/04-install_telegraf.sh new file mode 100755 index 00000000..729f9003 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/04-install_telegraf.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/unix/telegraf_install.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-install_telegraf.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-install_telegraf.sh new file mode 100755 index 00000000..729f9003 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-install_telegraf.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/unix/telegraf_install.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-install_telegraf.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-install_telegraf.sh new file mode 100755 index 00000000..729f9003 --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-install_telegraf.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/unix/telegraf_install.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/04-install_telegraf.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/04-install_telegraf.sh new file mode 100755 index 00000000..729f9003 --- /dev/null +++ b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/04-install_telegraf.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/unix/telegraf_install.sh diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/26-install_telegraf.sh b/coin/provisioning/qtci-macos-10.12-x86_64/26-install_telegraf.sh new file mode 100755 index 00000000..729f9003 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.12-x86_64/26-install_telegraf.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/unix/telegraf_install.sh diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/26-install_telegraf.sh b/coin/provisioning/qtci-macos-10.13-x86_64/26-install_telegraf.sh new file mode 100755 index 00000000..729f9003 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.13-x86_64/26-install_telegraf.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/unix/telegraf_install.sh diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/26-install_telegraf.sh b/coin/provisioning/qtci-macos-10.14-x86_64/26-install_telegraf.sh new file mode 100755 index 00000000..729f9003 --- /dev/null +++ b/coin/provisioning/qtci-macos-10.14-x86_64/26-install_telegraf.sh @@ -0,0 +1,3 @@ +#!/bin/sh + +"$(dirname "$0")"/../common/unix/telegraf_install.sh diff --git a/coin/provisioning/qtci-windows-10-x86/05-install_telegraf.ps1 b/coin/provisioning/qtci-windows-10-x86/05-install_telegraf.ps1 new file mode 100644 index 00000000..77fa8cbf --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/05-install_telegraf.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install_telegraf.ps1" diff --git a/coin/provisioning/qtci-windows-10-x86_64/05-install_telegraf.ps1 b/coin/provisioning/qtci-windows-10-x86_64/05-install_telegraf.ps1 new file mode 100644 index 00000000..77fa8cbf --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/05-install_telegraf.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install_telegraf.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86/05-install_telegraf.ps1 b/coin/provisioning/qtci-windows-7-x86/05-install_telegraf.ps1 new file mode 100644 index 00000000..77fa8cbf --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86/05-install_telegraf.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install_telegraf.ps1" diff --git a/coin/provisioning/qtci-windows-7-x86_64/05-install_telegraf.ps1 b/coin/provisioning/qtci-windows-7-x86_64/05-install_telegraf.ps1 new file mode 100644 index 00000000..77fa8cbf --- /dev/null +++ b/coin/provisioning/qtci-windows-7-x86_64/05-install_telegraf.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install_telegraf.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86/05-install_telegraf.ps1 b/coin/provisioning/qtci-windows-8.1-x86/05-install_telegraf.ps1 new file mode 100644 index 00000000..77fa8cbf --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86/05-install_telegraf.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install_telegraf.ps1" diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/05-install_telegraf.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/05-install_telegraf.ps1 new file mode 100644 index 00000000..77fa8cbf --- /dev/null +++ b/coin/provisioning/qtci-windows-8.1-x86_64/05-install_telegraf.ps1 @@ -0,0 +1 @@ +. "$PSScriptRoot\..\common\windows\install_telegraf.ps1" From 89f6db8c2232b543aaebfe1ba8d9ba8d3a7fc177 Mon Sep 17 00:00:00 2001 From: Dimitrios Apostolou Date: Thu, 12 Sep 2019 01:12:18 +0200 Subject: [PATCH 091/105] Adjust pre-existing script to use the new common.sourced.sh Change-Id: Icf7829d3499110a76b90679ba2d067f80d189e69 Reviewed-by: Heikki Halmet --- .../common/macos/increase_limits.sh | 18 ++++---- .../01-increase_limits.sh | 45 +------------------ .../01-increase_limits.sh | 45 +------------------ .../01-increase_limits.sh | 45 +------------------ 4 files changed, 14 insertions(+), 139 deletions(-) diff --git a/coin/provisioning/common/macos/increase_limits.sh b/coin/provisioning/common/macos/increase_limits.sh index 666d9067..040c55e8 100755 --- a/coin/provisioning/common/macos/increase_limits.sh +++ b/coin/provisioning/common/macos/increase_limits.sh @@ -39,22 +39,20 @@ # and they sometimes create problems to the build process and telegraf. -# Must have this variable set in the environment -[ x"$PROVISION_DIR" = x ] && exit 38 +set -e + +PROVISIONING_DIR="$(dirname "$0")/../../" +. "$PROVISIONING_DIR"/common/unix/common.sourced.sh echo "Current limits are:" ulimit -a launchctl limit -sudo cp $PROVISION_DIR/common/macos/limit.maxfiles.plist /Library/LaunchDaemons/ -sudo cp $PROVISION_DIR/common/macos/limit.maxproc.plist /Library/LaunchDaemons/ - -sudo chown root:wheel /Library/LaunchDaemons/limit.maxfiles.plist -sudo chown root:wheel /Library/LaunchDaemons/limit.maxproc.plist - -sudo chmod 644 /Library/LaunchDaemons/limit.maxfiles.plist -sudo chmod 644 /Library/LaunchDaemons/limit.maxproc.plist +$CMD_INSTALL -m 644 -o root -g wheel \ + $PROVISIONING_DIR/common/macos/limit.maxfiles.plist \ + $PROVISIONING_DIR/common/macos/limit.maxproc.plist \ + /Library/LaunchDaemons/ # Activate the new limits immediately (not for the current session though) sudo launchctl load -w /Library/LaunchDaemons/limit.maxfiles.plist diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/01-increase_limits.sh b/coin/provisioning/qtci-macos-10.12-x86_64/01-increase_limits.sh index c7bf7a88..08669e52 100755 --- a/coin/provisioning/qtci-macos-10.12-x86_64/01-increase_limits.sh +++ b/coin/provisioning/qtci-macos-10.12-x86_64/01-increase_limits.sh @@ -1,44 +1,3 @@ -#!/usr/bin/env bash +#!/bin/sh -############################################################################# -## -## Copyright (C) 2019 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 - - -PROVISION_DIR="$(dirname "$0")/.." -export PROVISION_DIR - - -. "$PROVISION_DIR"/common/macos/increase_limits.sh +"$(dirname "$0")"/../common/macos/increase_limits.sh diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/01-increase_limits.sh b/coin/provisioning/qtci-macos-10.13-x86_64/01-increase_limits.sh index c7bf7a88..08669e52 100755 --- a/coin/provisioning/qtci-macos-10.13-x86_64/01-increase_limits.sh +++ b/coin/provisioning/qtci-macos-10.13-x86_64/01-increase_limits.sh @@ -1,44 +1,3 @@ -#!/usr/bin/env bash +#!/bin/sh -############################################################################# -## -## Copyright (C) 2019 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 - - -PROVISION_DIR="$(dirname "$0")/.." -export PROVISION_DIR - - -. "$PROVISION_DIR"/common/macos/increase_limits.sh +"$(dirname "$0")"/../common/macos/increase_limits.sh diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/01-increase_limits.sh b/coin/provisioning/qtci-macos-10.14-x86_64/01-increase_limits.sh index c7bf7a88..08669e52 100755 --- a/coin/provisioning/qtci-macos-10.14-x86_64/01-increase_limits.sh +++ b/coin/provisioning/qtci-macos-10.14-x86_64/01-increase_limits.sh @@ -1,44 +1,3 @@ -#!/usr/bin/env bash +#!/bin/sh -############################################################################# -## -## Copyright (C) 2019 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 - - -PROVISION_DIR="$(dirname "$0")/.." -export PROVISION_DIR - - -. "$PROVISION_DIR"/common/macos/increase_limits.sh +"$(dirname "$0")"/../common/macos/increase_limits.sh From 8f4c12bc03f2617d499c45b342474eef7337f1a0 Mon Sep 17 00:00:00 2001 From: Dimitrios Apostolou Date: Fri, 20 Sep 2019 00:16:28 +0200 Subject: [PATCH 092/105] Install 7-zip at the beginning of provisioning Windows so that we can extract zip files early and install telegraf. Also moved disabling Windows defender, to keep it at the very beginning of provisioning. Change-Id: I6c2039ebd20e541bdd7d437dd56ccb06a1619a5f Reviewed-by: Heikki Halmet --- .../{01-disable-windefender.ps1 => 00-disable-windefender.ps1} | 0 .../{03-install-sevenzip.ps1 => 00-install-sevenzip.ps1} | 0 .../{01-disable-windefender.ps1 => 00-disable-windefender.ps1} | 0 .../{03-install-sevenzip.ps1 => 00-install-sevenzip.ps1} | 0 .../{04-disable-windefender.ps1 => 00-disable-windefender.ps1} | 0 .../{03-install-sevenzip.ps1 => 00-install-sevenzip.ps1} | 0 .../{04-disable-windefender.ps1 => 00-disable-windefender.ps1} | 0 .../{03-install-sevenzip.ps1 => 00-install-sevenzip.ps1} | 0 .../{04-disable-windefender.ps1 => 00-disable-windefender.ps1} | 0 .../{03-install-sevenzip.ps1 => 00-install-sevenzip.ps1} | 0 .../{04-disable-windefender.ps1 => 00-disable-windefender.ps1} | 0 .../{03-install-sevenzip.ps1 => 00-install-sevenzip.ps1} | 0 12 files changed, 0 insertions(+), 0 deletions(-) rename coin/provisioning/qtci-windows-10-x86/{01-disable-windefender.ps1 => 00-disable-windefender.ps1} (100%) rename coin/provisioning/qtci-windows-10-x86/{03-install-sevenzip.ps1 => 00-install-sevenzip.ps1} (100%) rename coin/provisioning/qtci-windows-10-x86_64/{01-disable-windefender.ps1 => 00-disable-windefender.ps1} (100%) rename coin/provisioning/qtci-windows-10-x86_64/{03-install-sevenzip.ps1 => 00-install-sevenzip.ps1} (100%) rename coin/provisioning/qtci-windows-7-x86/{04-disable-windefender.ps1 => 00-disable-windefender.ps1} (100%) rename coin/provisioning/qtci-windows-7-x86/{03-install-sevenzip.ps1 => 00-install-sevenzip.ps1} (100%) rename coin/provisioning/qtci-windows-7-x86_64/{04-disable-windefender.ps1 => 00-disable-windefender.ps1} (100%) rename coin/provisioning/qtci-windows-7-x86_64/{03-install-sevenzip.ps1 => 00-install-sevenzip.ps1} (100%) rename coin/provisioning/qtci-windows-8.1-x86/{04-disable-windefender.ps1 => 00-disable-windefender.ps1} (100%) rename coin/provisioning/qtci-windows-8.1-x86/{03-install-sevenzip.ps1 => 00-install-sevenzip.ps1} (100%) rename coin/provisioning/qtci-windows-8.1-x86_64/{04-disable-windefender.ps1 => 00-disable-windefender.ps1} (100%) rename coin/provisioning/qtci-windows-8.1-x86_64/{03-install-sevenzip.ps1 => 00-install-sevenzip.ps1} (100%) diff --git a/coin/provisioning/qtci-windows-10-x86/01-disable-windefender.ps1 b/coin/provisioning/qtci-windows-10-x86/00-disable-windefender.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86/01-disable-windefender.ps1 rename to coin/provisioning/qtci-windows-10-x86/00-disable-windefender.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86/03-install-sevenzip.ps1 b/coin/provisioning/qtci-windows-10-x86/00-install-sevenzip.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86/03-install-sevenzip.ps1 rename to coin/provisioning/qtci-windows-10-x86/00-install-sevenzip.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/01-disable-windefender.ps1 b/coin/provisioning/qtci-windows-10-x86_64/00-disable-windefender.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86_64/01-disable-windefender.ps1 rename to coin/provisioning/qtci-windows-10-x86_64/00-disable-windefender.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/03-install-sevenzip.ps1 b/coin/provisioning/qtci-windows-10-x86_64/00-install-sevenzip.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86_64/03-install-sevenzip.ps1 rename to coin/provisioning/qtci-windows-10-x86_64/00-install-sevenzip.ps1 diff --git a/coin/provisioning/qtci-windows-7-x86/04-disable-windefender.ps1 b/coin/provisioning/qtci-windows-7-x86/00-disable-windefender.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-7-x86/04-disable-windefender.ps1 rename to coin/provisioning/qtci-windows-7-x86/00-disable-windefender.ps1 diff --git a/coin/provisioning/qtci-windows-7-x86/03-install-sevenzip.ps1 b/coin/provisioning/qtci-windows-7-x86/00-install-sevenzip.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-7-x86/03-install-sevenzip.ps1 rename to coin/provisioning/qtci-windows-7-x86/00-install-sevenzip.ps1 diff --git a/coin/provisioning/qtci-windows-7-x86_64/04-disable-windefender.ps1 b/coin/provisioning/qtci-windows-7-x86_64/00-disable-windefender.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-7-x86_64/04-disable-windefender.ps1 rename to coin/provisioning/qtci-windows-7-x86_64/00-disable-windefender.ps1 diff --git a/coin/provisioning/qtci-windows-7-x86_64/03-install-sevenzip.ps1 b/coin/provisioning/qtci-windows-7-x86_64/00-install-sevenzip.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-7-x86_64/03-install-sevenzip.ps1 rename to coin/provisioning/qtci-windows-7-x86_64/00-install-sevenzip.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86/04-disable-windefender.ps1 b/coin/provisioning/qtci-windows-8.1-x86/00-disable-windefender.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-8.1-x86/04-disable-windefender.ps1 rename to coin/provisioning/qtci-windows-8.1-x86/00-disable-windefender.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86/03-install-sevenzip.ps1 b/coin/provisioning/qtci-windows-8.1-x86/00-install-sevenzip.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-8.1-x86/03-install-sevenzip.ps1 rename to coin/provisioning/qtci-windows-8.1-x86/00-install-sevenzip.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/04-disable-windefender.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/00-disable-windefender.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-8.1-x86_64/04-disable-windefender.ps1 rename to coin/provisioning/qtci-windows-8.1-x86_64/00-disable-windefender.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/03-install-sevenzip.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/00-install-sevenzip.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-8.1-x86_64/03-install-sevenzip.ps1 rename to coin/provisioning/qtci-windows-8.1-x86_64/00-install-sevenzip.ps1 From 4e3a0f79fbe8bea7915b267e132ba1e0d4b67733 Mon Sep 17 00:00:00 2001 From: Dimitrios Apostolou Date: Fri, 20 Sep 2019 13:00:12 +0200 Subject: [PATCH 093/105] DownloadURL now works with either wget or curl The reason is that Ubuntu does not have curl at the very beginning of provisioning scripts, and also does not have the repositories configured in order to install it. Change-Id: Ia485c1672f894bc800f199b742d238b2945938e5 Reviewed-by: Heikki Halmet --- coin/provisioning/common/unix/DownloadURL.sh | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/coin/provisioning/common/unix/DownloadURL.sh b/coin/provisioning/common/unix/DownloadURL.sh index da6d772f..0579451f 100755 --- a/coin/provisioning/common/unix/DownloadURL.sh +++ b/coin/provisioning/common/unix/DownloadURL.sh @@ -46,6 +46,15 @@ command -v sha512sum >/dev/null || alias sha512sum='shasum -a 512' ######################################################################## +Download () { + url="$1" + targetFile="$2" + + command -v curl >/dev/null \ + && curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url" \ + || wget --tries 5 -O "$targetFile" "$url" +} + VerifyHash () { file=$1 expectedHash=$2 @@ -87,10 +96,10 @@ DownloadURL () { echo "Skipping download, found and validated existing file: $targetFile" else echo "Downloading from primary URL: $url" - if ! curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url" + if ! Download "$url" "$targetFile" then echo "FAIL! to download, trying alternative URL: $url2" 1>&2 - if ! curl --fail -L --retry 5 --retry-delay 5 -o "$targetFile" "$url2" + if ! Download "$url" "$targetFile" then echo 'FAIL! to download even from alternative url' 1>&2 return 1 From de56775c32e82435738ceb96e75e9e0de17b8b68 Mon Sep 17 00:00:00 2001 From: Dimitrios Apostolou Date: Thu, 19 Sep 2019 22:07:15 +0200 Subject: [PATCH 094/105] Move telegraf install to start of provisioning windows Change-Id: Icf4f213be5a33ec2ad89d514b9bba5d4a3587117 Reviewed-by: Heikki Halmet --- .../{05-install_telegraf.ps1 => 01-install_telegraf.ps1} | 0 .../{05-install_telegraf.ps1 => 01-install_telegraf.ps1} | 0 .../{05-install_telegraf.ps1 => 01-install_telegraf.ps1} | 0 .../{05-install_telegraf.ps1 => 01-install_telegraf.ps1} | 0 .../{05-install_telegraf.ps1 => 01-install_telegraf.ps1} | 0 .../{05-install_telegraf.ps1 => 01-install_telegraf.ps1} | 0 6 files changed, 0 insertions(+), 0 deletions(-) rename coin/provisioning/qtci-windows-10-x86/{05-install_telegraf.ps1 => 01-install_telegraf.ps1} (100%) rename coin/provisioning/qtci-windows-10-x86_64/{05-install_telegraf.ps1 => 01-install_telegraf.ps1} (100%) rename coin/provisioning/qtci-windows-7-x86/{05-install_telegraf.ps1 => 01-install_telegraf.ps1} (100%) rename coin/provisioning/qtci-windows-7-x86_64/{05-install_telegraf.ps1 => 01-install_telegraf.ps1} (100%) rename coin/provisioning/qtci-windows-8.1-x86/{05-install_telegraf.ps1 => 01-install_telegraf.ps1} (100%) rename coin/provisioning/qtci-windows-8.1-x86_64/{05-install_telegraf.ps1 => 01-install_telegraf.ps1} (100%) diff --git a/coin/provisioning/qtci-windows-10-x86/05-install_telegraf.ps1 b/coin/provisioning/qtci-windows-10-x86/01-install_telegraf.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86/05-install_telegraf.ps1 rename to coin/provisioning/qtci-windows-10-x86/01-install_telegraf.ps1 diff --git a/coin/provisioning/qtci-windows-10-x86_64/05-install_telegraf.ps1 b/coin/provisioning/qtci-windows-10-x86_64/01-install_telegraf.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-10-x86_64/05-install_telegraf.ps1 rename to coin/provisioning/qtci-windows-10-x86_64/01-install_telegraf.ps1 diff --git a/coin/provisioning/qtci-windows-7-x86/05-install_telegraf.ps1 b/coin/provisioning/qtci-windows-7-x86/01-install_telegraf.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-7-x86/05-install_telegraf.ps1 rename to coin/provisioning/qtci-windows-7-x86/01-install_telegraf.ps1 diff --git a/coin/provisioning/qtci-windows-7-x86_64/05-install_telegraf.ps1 b/coin/provisioning/qtci-windows-7-x86_64/01-install_telegraf.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-7-x86_64/05-install_telegraf.ps1 rename to coin/provisioning/qtci-windows-7-x86_64/01-install_telegraf.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86/05-install_telegraf.ps1 b/coin/provisioning/qtci-windows-8.1-x86/01-install_telegraf.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-8.1-x86/05-install_telegraf.ps1 rename to coin/provisioning/qtci-windows-8.1-x86/01-install_telegraf.ps1 diff --git a/coin/provisioning/qtci-windows-8.1-x86_64/05-install_telegraf.ps1 b/coin/provisioning/qtci-windows-8.1-x86_64/01-install_telegraf.ps1 similarity index 100% rename from coin/provisioning/qtci-windows-8.1-x86_64/05-install_telegraf.ps1 rename to coin/provisioning/qtci-windows-8.1-x86_64/01-install_telegraf.ps1 From c4e14a59ecb1c47f4aa3d2fb726ec37384a7eb3b Mon Sep 17 00:00:00 2001 From: Dimitrios Apostolou Date: Thu, 19 Sep 2019 22:10:49 +0200 Subject: [PATCH 095/105] Move telegraf install to start of provisioning linux Change-Id: Ia42b0c21f6e341a941e98d3abbda512cfb0fda92 Reviewed-by: Heikki Halmet --- .../{04-install_telegraf.sh => 01-install_telegraf.sh} | 0 .../{04-install_telegraf.sh => 01-install_telegraf.sh} | 0 .../{04-install_telegraf.sh => 01-install_telegraf.sh} | 0 .../{04-install_telegraf.sh => 01-install_telegraf.sh} | 0 .../{04-install_telegraf.sh => 01-install_telegraf.sh} | 0 .../{04-install_telegraf.sh => 01-install_telegraf.sh} | 0 .../{04-install_telegraf.sh => 01-install_telegraf.sh} | 0 .../{04-install_telegraf.sh => 01-install_telegraf.sh} | 0 8 files changed, 0 insertions(+), 0 deletions(-) rename coin/provisioning/qtci-linux-RHEL-6.6-x86_64/{04-install_telegraf.sh => 01-install_telegraf.sh} (100%) rename coin/provisioning/qtci-linux-RHEL-7.4-x86_64/{04-install_telegraf.sh => 01-install_telegraf.sh} (100%) rename coin/provisioning/qtci-linux-SLES-12-x86_64/{04-install_telegraf.sh => 01-install_telegraf.sh} (100%) rename coin/provisioning/qtci-linux-SLES-15-x86_64/{04-install_telegraf.sh => 01-install_telegraf.sh} (100%) rename coin/provisioning/qtci-linux-Ubuntu-16.04-x86/{04-install_telegraf.sh => 01-install_telegraf.sh} (100%) rename coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/{04-install_telegraf.sh => 01-install_telegraf.sh} (100%) rename coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/{04-install_telegraf.sh => 01-install_telegraf.sh} (100%) rename coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/{04-install_telegraf.sh => 01-install_telegraf.sh} (100%) diff --git a/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/04-install_telegraf.sh b/coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-install_telegraf.sh similarity index 100% rename from coin/provisioning/qtci-linux-RHEL-6.6-x86_64/04-install_telegraf.sh rename to coin/provisioning/qtci-linux-RHEL-6.6-x86_64/01-install_telegraf.sh diff --git a/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install_telegraf.sh b/coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-install_telegraf.sh similarity index 100% rename from coin/provisioning/qtci-linux-RHEL-7.4-x86_64/04-install_telegraf.sh rename to coin/provisioning/qtci-linux-RHEL-7.4-x86_64/01-install_telegraf.sh diff --git a/coin/provisioning/qtci-linux-SLES-12-x86_64/04-install_telegraf.sh b/coin/provisioning/qtci-linux-SLES-12-x86_64/01-install_telegraf.sh similarity index 100% rename from coin/provisioning/qtci-linux-SLES-12-x86_64/04-install_telegraf.sh rename to coin/provisioning/qtci-linux-SLES-12-x86_64/01-install_telegraf.sh diff --git a/coin/provisioning/qtci-linux-SLES-15-x86_64/04-install_telegraf.sh b/coin/provisioning/qtci-linux-SLES-15-x86_64/01-install_telegraf.sh similarity index 100% rename from coin/provisioning/qtci-linux-SLES-15-x86_64/04-install_telegraf.sh rename to coin/provisioning/qtci-linux-SLES-15-x86_64/01-install_telegraf.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/04-install_telegraf.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86/01-install_telegraf.sh similarity index 100% rename from coin/provisioning/qtci-linux-Ubuntu-16.04-x86/04-install_telegraf.sh rename to coin/provisioning/qtci-linux-Ubuntu-16.04-x86/01-install_telegraf.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-install_telegraf.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-install_telegraf.sh similarity index 100% rename from coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/04-install_telegraf.sh rename to coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/01-install_telegraf.sh diff --git a/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-install_telegraf.sh b/coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/01-install_telegraf.sh similarity index 100% rename from coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-install_telegraf.sh rename to coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/01-install_telegraf.sh diff --git a/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/04-install_telegraf.sh b/coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-install_telegraf.sh similarity index 100% rename from coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/04-install_telegraf.sh rename to coin/provisioning/qtci-linux-openSUSE-42.3-x86_64/01-install_telegraf.sh From 842b72e0803af40d35467540c612370a2e15f15a Mon Sep 17 00:00:00 2001 From: Dimitrios Apostolou Date: Thu, 19 Sep 2019 22:11:45 +0200 Subject: [PATCH 096/105] Move telegraf install to start of provisioning macos Change-Id: Ied2b7a415abe5e101b6bfb60472b74070debe9e9 Reviewed-by: Heikki Halmet --- .../{26-install_telegraf.sh => 01-install_telegraf.sh} | 0 .../{26-install_telegraf.sh => 01-install_telegraf.sh} | 0 .../{26-install_telegraf.sh => 01-install_telegraf.sh} | 0 3 files changed, 0 insertions(+), 0 deletions(-) rename coin/provisioning/qtci-macos-10.12-x86_64/{26-install_telegraf.sh => 01-install_telegraf.sh} (100%) rename coin/provisioning/qtci-macos-10.13-x86_64/{26-install_telegraf.sh => 01-install_telegraf.sh} (100%) rename coin/provisioning/qtci-macos-10.14-x86_64/{26-install_telegraf.sh => 01-install_telegraf.sh} (100%) diff --git a/coin/provisioning/qtci-macos-10.12-x86_64/26-install_telegraf.sh b/coin/provisioning/qtci-macos-10.12-x86_64/01-install_telegraf.sh similarity index 100% rename from coin/provisioning/qtci-macos-10.12-x86_64/26-install_telegraf.sh rename to coin/provisioning/qtci-macos-10.12-x86_64/01-install_telegraf.sh diff --git a/coin/provisioning/qtci-macos-10.13-x86_64/26-install_telegraf.sh b/coin/provisioning/qtci-macos-10.13-x86_64/01-install_telegraf.sh similarity index 100% rename from coin/provisioning/qtci-macos-10.13-x86_64/26-install_telegraf.sh rename to coin/provisioning/qtci-macos-10.13-x86_64/01-install_telegraf.sh diff --git a/coin/provisioning/qtci-macos-10.14-x86_64/26-install_telegraf.sh b/coin/provisioning/qtci-macos-10.14-x86_64/01-install_telegraf.sh similarity index 100% rename from coin/provisioning/qtci-macos-10.14-x86_64/26-install_telegraf.sh rename to coin/provisioning/qtci-macos-10.14-x86_64/01-install_telegraf.sh From 33e0c2b54fc2a8e489b1df1277a96df676d78504 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 26 Sep 2019 22:31:15 +0200 Subject: [PATCH 097/105] Update submodules on '5.14' in qt/qt5 Change-Id: I79b9eeb90afc56baae339b6598dd01840d6918ee Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtquickcontrols | 2 +- qttools | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/qt3d b/qt3d index 29dc5ced..637a9d68 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 29dc5ced83b9d992ca533711d25ab31ebe984ee4 +Subproject commit 637a9d688a85c452ac0a20378961081a08980cf6 diff --git a/qtbase b/qtbase index dc042c6d..fc8d6d3e 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit dc042c6deea7e90b4a9dfcffdc33cbe61df421bd +Subproject commit fc8d6d3ea142df74885e5d64bc89e677d9f393b6 diff --git a/qtdeclarative b/qtdeclarative index c734eb3a..1da49d84 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit c734eb3a8bda3b24721d80c380189c5e754a9b38 +Subproject commit 1da49d8493de7180a9db38d4614ba6fbbe898276 diff --git a/qtmultimedia b/qtmultimedia index 6a563af7..08ba19f1 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 6a563af70fb811b115b9f87b8d6ff58928102b2a +Subproject commit 08ba19f1dd3258a1805d091ea5f89f50e836b594 diff --git a/qtqa b/qtqa index 8cafe2ce..be52132d 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 8cafe2ce3fd9302b29cb8cbfc93414cc6fc7d83c +Subproject commit be52132dd5b59cec45eb93f09d20211df990596e diff --git a/qtquick3d b/qtquick3d index c0447d7c..82af99cf 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit c0447d7c96fff84981ac4cd6fa1aa8e1a6b60645 +Subproject commit 82af99cf0e7a5497ad848868dcdabd8b54612685 diff --git a/qtquickcontrols b/qtquickcontrols index 219b55fa..7c15a3bc 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 219b55faa4848a4967bb34e34d4326a854b12e2a +Subproject commit 7c15a3bc25cdde1c4fe131b06e8c942afa7edf04 diff --git a/qttools b/qttools index 3179a484..0407495a 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 3179a484e03df899c70be234750081eca599416f +Subproject commit 0407495a027b8e662c773eafb50ab66fd4638962 From 6cb7171397d08a54a2d4f30d4deb897ced383ed8 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 27 Sep 2019 22:31:24 +0200 Subject: [PATCH 098/105] Update submodules on '5.14' in qt/qt5 Change-Id: I5575a3cf1dd9cecf5162b077e64b28eec15bcffd Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtquick3d | 2 +- qtquicktimeline | 2 +- qtscxml | 2 +- qttools | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebview | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/qt3d b/qt3d index 637a9d68..cbfa01d7 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 637a9d688a85c452ac0a20378961081a08980cf6 +Subproject commit cbfa01d796aa8e95bb5f8985169c1b1a83d08d6b diff --git a/qtbase b/qtbase index fc8d6d3e..388d5398 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit fc8d6d3ea142df74885e5d64bc89e677d9f393b6 +Subproject commit 388d539865c4e7f904b29c6e19e41852f24981b8 diff --git a/qtdeclarative b/qtdeclarative index 1da49d84..6bb678ba 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 1da49d8493de7180a9db38d4614ba6fbbe898276 +Subproject commit 6bb678bad25eafe76dcebcd1ff184be9de9125bb diff --git a/qtquick3d b/qtquick3d index 82af99cf..d73e75f2 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 82af99cf0e7a5497ad848868dcdabd8b54612685 +Subproject commit d73e75f27e67f0bcb261b25d668cc7a7284e45f1 diff --git a/qtquicktimeline b/qtquicktimeline index 18bd2a9f..768b9bf6 160000 --- a/qtquicktimeline +++ b/qtquicktimeline @@ -1 +1 @@ -Subproject commit 18bd2a9fbb38d3357aa0bfece163c80e88d83258 +Subproject commit 768b9bf6db8d468125547b37a00e54784a757e3b diff --git a/qtscxml b/qtscxml index 99349b79..97cadf64 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 99349b791bfbd54b5cdb290dea6656949b50963d +Subproject commit 97cadf64f3dbaf0c7c35242d51dc09c052e5f136 diff --git a/qttools b/qttools index 0407495a..72a57764 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 0407495a027b8e662c773eafb50ab66fd4638962 +Subproject commit 72a5776421948ab82bcfa4d744a027cadcd7267e diff --git a/qtwebchannel b/qtwebchannel index 744a7330..1f6c72df 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 744a7330f786259bd48e442da391d11ab12d62c7 +Subproject commit 1f6c72df8b33741dc798042dd8c2e75f3af46232 diff --git a/qtwebengine b/qtwebengine index 2a306349..df24e63b 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 2a306349512dd47fefa7a7f1ee7e84e374e6334a +Subproject commit df24e63b6e5f6775ac4738cc0ea12ec0cd41a620 diff --git a/qtwebview b/qtwebview index ffb73c62..20730e77 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit ffb73c620595c80ee61c9c0e252aa11396c8b83b +Subproject commit 20730e776155087d9a6b4fbd3d670d37c4e5d1d7 From ec613d93e5002b802979d07980d5fe23b95f3a8d Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 27 Sep 2019 23:31:05 +0200 Subject: [PATCH 099/105] Update submodules on '5.13' in qt/qt5 Change-Id: I1e6126cbe20e293bc4ec88a492c0bf9ebfffd766 Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtconnectivity | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquickcontrols2 | 2 +- qttools | 2 +- qtwebengine | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/qt3d b/qt3d index 7b7d3cbb..bd3aa578 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 7b7d3cbb23eab884577f2341deb25bdd36c4cae6 +Subproject commit bd3aa578b8d822840fc3d4a6ef819b29b2c26034 diff --git a/qtbase b/qtbase index 94788314..21d988a1 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 947883141d9d8b3079a8a21981ad8a5ce3c4798e +Subproject commit 21d988a199d0b4296d481d119ffec2c1253a584f diff --git a/qtconnectivity b/qtconnectivity index d3ace860..7390de23 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit d3ace86011d4e34eeafa795270ac027afd54f857 +Subproject commit 7390de230e3c86049824bef756e4af623a547d61 diff --git a/qtdeclarative b/qtdeclarative index 36be2726..a0ad2cbd 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 36be27265d61c76b25417a25e482030e30ff380f +Subproject commit a0ad2cbdf27d0d23727b09609e127ac17e414a22 diff --git a/qtdoc b/qtdoc index 21d65d5c..4a69e417 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 21d65d5c2dbfadb3e6dae0707f2ba6e0d4bb2c30 +Subproject commit 4a69e417041370cc7a911da19497fbdd9537f16d diff --git a/qtmultimedia b/qtmultimedia index bf6ac0f0..5155d1af 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit bf6ac0f0df5510aa65ecd9bb050bd13d47089d4a +Subproject commit 5155d1afb36a44a3916cce1abf124c67f9cb4700 diff --git a/qtqa b/qtqa index 8cafe2ce..be52132d 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 8cafe2ce3fd9302b29cb8cbfc93414cc6fc7d83c +Subproject commit be52132dd5b59cec45eb93f09d20211df990596e diff --git a/qtquickcontrols2 b/qtquickcontrols2 index d39a6d80..100550dd 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit d39a6d80f63414a4e933ac2f859805635850942a +Subproject commit 100550dd22dc8eaa47405cdb3e7e461edb01a7a3 diff --git a/qttools b/qttools index 488f2454..c8e79294 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 488f24540d087ae98fff4b3a4de82bdf9acbc72c +Subproject commit c8e79294237260d735324663932a676d8084efcb diff --git a/qtwebengine b/qtwebengine index e31acc86..b44ed0fb 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit e31acc86e991d6f83bd56eebb7371914fc9ca5ac +Subproject commit b44ed0fb99cd3d7047fcd322010c27cfa7989a18 From 1a4d0a953415117901907f399de0df8897efca2c Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 29 Sep 2019 22:31:18 +0200 Subject: [PATCH 100/105] Update submodules on '5.14' in qt/qt5 Change-Id: I1a1e2430d47476de5271b9278e84f53743bdbcee Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdoc | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtquickcontrols | 2 +- qttools | 2 +- qtwayland | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qtbase b/qtbase index 388d5398..08a60103 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 388d539865c4e7f904b29c6e19e41852f24981b8 +Subproject commit 08a601035c9d09da9d19810d49e1e80d3897fd1a diff --git a/qtdoc b/qtdoc index 3bf066bd..ae7ae297 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 3bf066bdad5b4a3cdcd7b7c79985d2eef74b598a +Subproject commit ae7ae29711306987a10b180f1a630ed355fbb751 diff --git a/qtqa b/qtqa index be52132d..e50ae95c 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit be52132dd5b59cec45eb93f09d20211df990596e +Subproject commit e50ae95cdfd5a4967708b99ad7ff803f62cd623a diff --git a/qtquick3d b/qtquick3d index d73e75f2..4d904c4f 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit d73e75f27e67f0bcb261b25d668cc7a7284e45f1 +Subproject commit 4d904c4f9c365f3fb686580e651ab06126527d0d diff --git a/qtquickcontrols b/qtquickcontrols index 7c15a3bc..4f6bb86d 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 7c15a3bc25cdde1c4fe131b06e8c942afa7edf04 +Subproject commit 4f6bb86d24041d565ac3467df93593a150010825 diff --git a/qttools b/qttools index 72a57764..be8ffa4e 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 72a5776421948ab82bcfa4d744a027cadcd7267e +Subproject commit be8ffa4e910a3413bd3df907d8e15514691a0342 diff --git a/qtwayland b/qtwayland index e579a0d8..03e160cf 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit e579a0d8bdfb69649a9c22add5651d6dabcf142c +Subproject commit 03e160cfd286bb336e875a180efd83635be7a27f From 317fbf92434e54c6243325b29e6e28d54cb7c219 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 29 Sep 2019 23:31:03 +0200 Subject: [PATCH 101/105] Update submodules on '5.13' in qt/qt5 Change-Id: I0738664f8f0129431b7e5c212fe1615b09792aec Reviewed-by: Qt Submodule Update Bot --- qtbase | 2 +- qtdoc | 2 +- qtqa | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtbase b/qtbase index 21d988a1..46201f0e 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 21d988a199d0b4296d481d119ffec2c1253a584f +Subproject commit 46201f0e82a7b1629adad196dfa8f7ff1cf4dffd diff --git a/qtdoc b/qtdoc index 4a69e417..b5298436 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 4a69e417041370cc7a911da19497fbdd9537f16d +Subproject commit b52984369df0ba311a7f7106086d30a799e3bb61 diff --git a/qtqa b/qtqa index be52132d..e50ae95c 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit be52132dd5b59cec45eb93f09d20211df990596e +Subproject commit e50ae95cdfd5a4967708b99ad7ff803f62cd623a From b90dc27784a9d78284518e12b80a0054ef560760 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 30 Sep 2019 22:31:23 +0200 Subject: [PATCH 102/105] Update submodules on '5.14' in qt/qt5 Change-Id: I66ac39a88c5164d2feed7215029e621c122f90ee Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtmultimedia | 2 +- qtpurchasing | 2 +- qtquick3d | 2 +- qtquickcontrols2 | 2 +- qttools | 2 +- qtwebengine | 2 +- 12 files changed, 12 insertions(+), 12 deletions(-) diff --git a/qt3d b/qt3d index cbfa01d7..eb9f6859 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit cbfa01d796aa8e95bb5f8985169c1b1a83d08d6b +Subproject commit eb9f68599f1d94b8ee578ea18b3e3e5297cce73d diff --git a/qtbase b/qtbase index 08a60103..86876744 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 08a601035c9d09da9d19810d49e1e80d3897fd1a +Subproject commit 86876744f07cbaa01daca6869b896741878c39a3 diff --git a/qtcharts b/qtcharts index 98fe0e8d..911bc706 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 98fe0e8db097919ffc727194749753cc8dcb52f4 +Subproject commit 911bc706521021202d4c45a0ed2f7e5edd4e99af diff --git a/qtconnectivity b/qtconnectivity index 87617df9..db56df7f 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 87617df961fd5e7a1d7c3e3ceba4125ca7090f9e +Subproject commit db56df7fb05b465bf0e77dd086fc2a7b054ab1d9 diff --git a/qtdatavis3d b/qtdatavis3d index a1d12993..49b84db5 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit a1d12993858a3da5077c5edce7449618ce8f392d +Subproject commit 49b84db584092f8a1fa9b63c801cf8cdc3bd89ff diff --git a/qtdeclarative b/qtdeclarative index 6bb678ba..85bf1c43 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 6bb678bad25eafe76dcebcd1ff184be9de9125bb +Subproject commit 85bf1c438b36d91a77e3371d8fe2d8c3750c4858 diff --git a/qtmultimedia b/qtmultimedia index 08ba19f1..48206ccc 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 08ba19f1dd3258a1805d091ea5f89f50e836b594 +Subproject commit 48206ccc29154a2ebdbe14c549c84b2e590b6a06 diff --git a/qtpurchasing b/qtpurchasing index 597d8416..65fc328d 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 597d84162559291072eacc2c61aa872f01ef442a +Subproject commit 65fc328d223ae1d8980722ae4a8296ceb75ae91e diff --git a/qtquick3d b/qtquick3d index 4d904c4f..37d16ab6 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 4d904c4f9c365f3fb686580e651ab06126527d0d +Subproject commit 37d16ab6431beea4524ad9d07bc610504e611617 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 006c0551..b321adcf 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 006c0551cc9a515e89cb7d1dfa5ad2fe8531da2a +Subproject commit b321adcf7591d2c011a8ddc34758543b44f6afbf diff --git a/qttools b/qttools index be8ffa4e..272488db 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit be8ffa4e910a3413bd3df907d8e15514691a0342 +Subproject commit 272488dbc0534aade4caeb446bb562fcbe74bb01 diff --git a/qtwebengine b/qtwebengine index df24e63b..0136622c 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit df24e63b6e5f6775ac4738cc0ea12ec0cd41a620 +Subproject commit 0136622cb56acb0548f06563b4a8677265869dc0 From f4e7c08e82652161afa4568dbccf94c7576f775b Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 30 Sep 2019 23:30:57 +0200 Subject: [PATCH 103/105] Update submodules on '5.13' in qt/qt5 Change-Id: I328c1cb350e067765b0f05e75179cf178dd2b14e Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtlocation | 2 +- qtmultimedia | 2 +- qtquickcontrols2 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/qt3d b/qt3d index bd3aa578..c40cccb0 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit bd3aa578b8d822840fc3d4a6ef819b29b2c26034 +Subproject commit c40cccb0b4485045db61c2d4e825e33a68c58861 diff --git a/qtlocation b/qtlocation index 720beeb3..118dac89 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 720beeb3f768af5e89538dfe0429e31138e84e3c +Subproject commit 118dac89625a8f713bb12e7e9f30bc37b10754b7 diff --git a/qtmultimedia b/qtmultimedia index 5155d1af..545959e4 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 5155d1afb36a44a3916cce1abf124c67f9cb4700 +Subproject commit 545959e45ec86c70617f4839d20d931297c30c20 diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 100550dd..83fbf44b 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 100550dd22dc8eaa47405cdb3e7e461edb01a7a3 +Subproject commit 83fbf44b980c4a072ede122f2f16921bfff8c08d From cfef857815392831dc15075c98c53041689a01a4 Mon Sep 17 00:00:00 2001 From: Dimitrios Apostolou Date: Wed, 14 Aug 2019 15:52:56 +0200 Subject: [PATCH 104/105] Reduce noise in the provision logs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reduce verbosity in order to shorten logs and make them more readable. In two cases we just remove the verbose flag. In one other case we undo inlining of a huge script in the command line. Because we run the provisioning scripts in trace mode, this caused the script to be logged, and it was rather long and meaningless since it comes from an external project. Change-Id: I078ee3b3ab2db9425204375deb5815b6526a4466 Reviewed-by: Tony Sarajärvi --- coin/provisioning/common/linux/qnx_660.sh | 2 +- coin/provisioning/common/macos/homebrew.sh | 11 +++++++++-- .../common/macos/install-commandlinetools.sh | 2 +- 3 files changed, 11 insertions(+), 4 deletions(-) diff --git a/coin/provisioning/common/linux/qnx_660.sh b/coin/provisioning/common/linux/qnx_660.sh index 2add6901..eb6fd5f0 100755 --- a/coin/provisioning/common/linux/qnx_660.sh +++ b/coin/provisioning/common/linux/qnx_660.sh @@ -49,7 +49,7 @@ echo "$sha1 $targetFile" | sha1sum --check if [ ! -d "$targetFolder" ]; then mkdir -p $targetFolder fi -sudo tar -C $targetFolder -xvzf $targetFile +sudo tar -C $targetFolder -xzf $targetFile sudo chown -R qt:users "$targetFolder"/"$folderName" # Verify that we have last file in tar diff --git a/coin/provisioning/common/macos/homebrew.sh b/coin/provisioning/common/macos/homebrew.sh index f7042de3..715477c0 100755 --- a/coin/provisioning/common/macos/homebrew.sh +++ b/coin/provisioning/common/macos/homebrew.sh @@ -1,5 +1,12 @@ #!/usr/bin/env bash -# Will install homebrew package manager for macOS -/usr/bin/ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)" Date: Wed, 2 Oct 2019 15:20:34 +0200 Subject: [PATCH 105/105] Update submodules on '5.14' in qt/qt5 Change-Id: I97f37b6418a58b0546b7a8b7b91229db5229a81e Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtgamepad | 2 +- qtlocation | 2 +- qtlottie | 2 +- qtmultimedia | 2 +- qtqa | 2 +- qtquick3d | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtsensors | 2 +- qtspeech | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebview | 2 +- 18 files changed, 18 insertions(+), 18 deletions(-) diff --git a/qt3d b/qt3d index eb9f6859..6c105dc4 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit eb9f68599f1d94b8ee578ea18b3e3e5297cce73d +Subproject commit 6c105dc43722cc199924f78cf044dab7a9251f20 diff --git a/qtbase b/qtbase index 86876744..72d62144 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 86876744f07cbaa01daca6869b896741878c39a3 +Subproject commit 72d62144ab2bf67266aa0474515b54999b459d32 diff --git a/qtdeclarative b/qtdeclarative index 85bf1c43..dae5bc67 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 85bf1c438b36d91a77e3371d8fe2d8c3750c4858 +Subproject commit dae5bc672eb177ec858f035e0976e8ad93ca59b3 diff --git a/qtgamepad b/qtgamepad index 256bcfb7..9a179372 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 256bcfb73570c3f732ee5a7fcb0d40b3c08d55ff +Subproject commit 9a179372c1edff42bd0b4c96ff367e194b916a67 diff --git a/qtlocation b/qtlocation index 6b5b03c1..51ad5427 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 6b5b03c17008fd93e8e152f7e46f1bafe6568018 +Subproject commit 51ad54273f1c69f30e4c834f2ecec30a923d3565 diff --git a/qtlottie b/qtlottie index 03b666a9..665fd2e4 160000 --- a/qtlottie +++ b/qtlottie @@ -1 +1 @@ -Subproject commit 03b666a967fb7501248e9f40a5b187ec3a16c453 +Subproject commit 665fd2e47bed500ee5395ea5b9a6c57b4940ceed diff --git a/qtmultimedia b/qtmultimedia index 48206ccc..b8382a4a 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 48206ccc29154a2ebdbe14c549c84b2e590b6a06 +Subproject commit b8382a4ac487c64a70796aa9d9016b5604ca9446 diff --git a/qtqa b/qtqa index e50ae95c..0d0339d2 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit e50ae95cdfd5a4967708b99ad7ff803f62cd623a +Subproject commit 0d0339d246ffa79356cd956161030439662df3db diff --git a/qtquick3d b/qtquick3d index 37d16ab6..6d85dc13 160000 --- a/qtquick3d +++ b/qtquick3d @@ -1 +1 @@ -Subproject commit 37d16ab6431beea4524ad9d07bc610504e611617 +Subproject commit 6d85dc137cbfa338a7cc7570d2be4a2f7f201f1f diff --git a/qtquickcontrols b/qtquickcontrols index 4f6bb86d..6eac099f 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 4f6bb86d24041d565ac3467df93593a150010825 +Subproject commit 6eac099fa98b6dbe5a01ad90e4a1348729b1332b diff --git a/qtquickcontrols2 b/qtquickcontrols2 index b321adcf..a392194a 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit b321adcf7591d2c011a8ddc34758543b44f6afbf +Subproject commit a392194a575653dff3cd21227e6a1a2902b8399f diff --git a/qtsensors b/qtsensors index e48a2a27..3be08629 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit e48a2a270b74c80744dcff48e889d09bf5cdcc77 +Subproject commit 3be0862945fdd7ce3c1c79342ed1ce567d179cec diff --git a/qtspeech b/qtspeech index 98fc28e6..80ca340d 160000 --- a/qtspeech +++ b/qtspeech @@ -1 +1 @@ -Subproject commit 98fc28e6c681ce89d377e2613b6faf2e7c44147e +Subproject commit 80ca340defacca6550dec3dfd57429f9cab1825e diff --git a/qttools b/qttools index 272488db..be238aae 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 272488dbc0534aade4caeb446bb562fcbe74bb01 +Subproject commit be238aae25d2a8a9eed9da382f8ba769beb87be5 diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index e6850606..932ae053 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit e685060648032a405fa286d19d50f065ac40510c +Subproject commit 932ae053ab9ea8aed974e8dde1bf7ef8524826a3 diff --git a/qtwayland b/qtwayland index 03e160cf..486c5191 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 03e160cfd286bb336e875a180efd83635be7a27f +Subproject commit 486c51912393bf56cae0e45931fb135579a930d3 diff --git a/qtwebengine b/qtwebengine index 0136622c..b50e7669 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 0136622cb56acb0548f06563b4a8677265869dc0 +Subproject commit b50e7669ea463a0c6d326b831dc816c939ff6398 diff --git a/qtwebview b/qtwebview index 20730e77..9f227c54 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 20730e776155087d9a6b4fbd3d670d37c4e5d1d7 +Subproject commit 9f227c54605a2cfea23886532173896fa992ae57