From 9929aff99ec02ed57ad9693b22eb4a84ac1388c5 Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Tue, 28 May 2019 11:41:31 +0300 Subject: [PATCH 01/49] 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 02/49] 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 03/49] 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 04/49] 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 05/49] 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 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 06/49] 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 63181db03e9419ed0dca894edcdc8a6911868667 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 2 Aug 2019 18:31:02 +0200 Subject: [PATCH 07/49] 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 53c6c8a1ba7917f49de686acdd6d4df081aa6fd5 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 14 Aug 2019 22:30:51 +0200 Subject: [PATCH 08/49] 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 09/49] 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 965653136183870854739a0b3d284719ac15d3cf Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 17 Aug 2019 23:30:59 +0200 Subject: [PATCH 10/49] 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 7c691c4622931a28d499230f6e42df14e48875e9 Mon Sep 17 00:00:00 2001 From: Paul Wicking Date: Mon, 19 Aug 2019 09:43:00 +0200 Subject: [PATCH 11/49] 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 12/49] 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 6e601907b9f92d0ca104c35d5f403654cbc93e81 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 19 Aug 2019 23:31:00 +0200 Subject: [PATCH 13/49] 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 8a5d86d88826cd4db6e3993d8fcb14db0bbab015 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Tue, 20 Aug 2019 09:49:21 +0300 Subject: [PATCH 14/49] 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 15/49] 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 16/49] 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 17/49] 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 18/49] 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 19/49] 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 20/49] 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 21/49] 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 22/49] 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 23/49] 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 24/49] 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 5752c0d4bc5927107d6aaadaf703f17f0a05406a Mon Sep 17 00:00:00 2001 From: Tuomas Heimonen Date: Thu, 29 Aug 2019 16:20:44 +0300 Subject: [PATCH 25/49] 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 26/49] 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 27/49] 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 ae3f765798629dd3bd4183245c9d58231e118a5c Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 1 Sep 2019 15:55:54 +0200 Subject: [PATCH 28/49] 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 29/49] 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 30/49] 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 31/49] 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 32/49] 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 33/49] 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 34/49] 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 35/49] 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 36/49] 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 37/49] 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 38/49] 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 d581d86fc50bff5e64821b20babaa801102d1a24 Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Wed, 14 Aug 2019 15:59:39 +0300 Subject: [PATCH 39/49] 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 40/49] 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 41/49] 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 42/49] 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 43/49] 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 44/49] 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 45/49] 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 4909f4a765246a36297fa5d869096541ef84f668 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 9 Sep 2019 20:59:09 +0200 Subject: [PATCH 46/49] 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 47/49] 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 bcdfcd266864a92719add4d76ad868659623f5cd Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 10 Sep 2019 22:12:13 +0200 Subject: [PATCH 48/49] 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 49/49] 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