From 04d6ce5b3d2282b915d1c4a98783e5ffbb4f3ff2 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Wed, 9 May 2018 12:35:56 +0200 Subject: [PATCH 1/7] Adjust submodule branches Change-Id: I3614287752f5fe1bc3795ae16df3ebaede9dc056 --- .gitmodules | 78 ++++++++++++++++++++++++++--------------------------- 1 file changed, 39 insertions(+), 39 deletions(-) diff --git a/.gitmodules b/.gitmodules index b4988927..9e40ead5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,66 +1,66 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.9 + branch = 5.9.6 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = 5.9 + branch = 5.9.6 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg qtxmlpatterns path = qtdeclarative url = ../qtdeclarative.git - branch = 5.9 + branch = 5.9.6 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = 5.9 + branch = 5.9.6 status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = 5.9 + branch = 5.9.6 status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = 5.9 + branch = 5.9.6 status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt path = qttools url = ../qttools.git - branch = 5.9 + branch = 5.9.6 status = essential [submodule "qtxmlpatterns"] depends = qtbase path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.9 + branch = 5.9.6 status = addon [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = 5.9 + branch = 5.9.6 status = essential priority = 30 [submodule "qtdoc"] depends = qtdeclarative path = qtdoc url = ../qtdoc.git - branch = 5.9 + branch = 5.9.6 status = essential priority = 40 [submodule "qtrepotools"] @@ -81,14 +81,14 @@ recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport path = qtlocation url = ../qtlocation.git - branch = 5.9 + branch = 5.9.6 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = 5.9 + branch = 5.9.6 status = addon [submodule "qtsystems"] depends = qtbase @@ -121,27 +121,27 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = 5.9 + branch = 5.9.6 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = 5.9 + branch = 5.9.6 status = addon [submodule "qt3d"] depends = qtbase recommends = qtdeclarative qtimageformats qtgamepad path = qt3d url = ../qt3d.git - branch = 5.9 + branch = 5.9.6 status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = 5.9 + branch = 5.9.6 status = addon [submodule "qtquick1"] depends = qtscript @@ -154,51 +154,51 @@ depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.9 + branch = 5.9.6 status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.9 + branch = 5.9.6 status = essential [submodule "qtserialbus"] depends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 5.9 + branch = 5.9.6 status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = 5.9 + branch = 5.9.6 status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = 5.9 + branch = 5.9.6 status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = 5.9 + branch = 5.9.6 status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = 5.9 + branch = 5.9.6 status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = 5.9 + branch = 5.9.6 status = addon [submodule "qtenginio"] depends = qtdeclarative @@ -211,101 +211,101 @@ recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = 5.9 + branch = 5.9.6 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = 5.9 + branch = 5.9.6 status = addon [submodule "qtwebengine"] depends = qtquickcontrols qtwebchannel recommends = qtlocation qttools path = qtwebengine url = ../qtwebengine.git - branch = 5.9 + branch = 5.9.6 status = addon priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative path = qtcanvas3d url = ../qtcanvas3d.git - branch = 5.9 + branch = 5.9.6 status = addon [submodule "qtwebview"] depends = qtdeclarative recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = 5.9 + branch = 5.9.6 status = addon [submodule "qtquickcontrols2"] depends = qtgraphicaleffects path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = 5.9 + branch = 5.9.6 status = addon [submodule "qtpurchasing"] depends = qtbase qtandroidextras recommends = qtdeclarative path = qtpurchasing url = ../qtpurchasing.git - branch = 5.9 + branch = 5.9.6 status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = 5.9 + branch = 5.9.6 status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = 5.9 + branch = 5.9.6 status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = 5.9 + branch = 5.9.6 status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad.git - branch = 5.9 + branch = 5.9.6 status = addon [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml.git - branch = 5.9 + branch = 5.9.6 status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech url = ../qtspeech.git - branch = 5.9 + branch = 5.9.6 status = preview [submodule "qtnetworkauth"] depends = qtbase recommends = qtwebview path = qtnetworkauth url = ../qtnetworkauth.git - branch = 5.9 + branch = 5.9.6 status = preview [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative path = qtremoteobjects url = ../qtremoteobjects.git - branch = 5.9 + branch = 5.9.6 status = preview From 26b22a63a1ee97550da7290e2635581fa83baafe Mon Sep 17 00:00:00 2001 From: Jani Heikkinen Date: Wed, 3 Jan 2018 08:01:05 +0200 Subject: [PATCH 2/7] Adjust QNX packaging builds for Qt 5.9 - Add missing 'Packaging' flag for linux and windows QNX builds Change-Id: Ie4c49b9bd93f67f6a2dbbdece99da8c8f5fb3bef Reviewed-by: Akseli Salovaara (cherry picked from commit de5d8f3b4fdd7dc36b445e7b1385e5516e8f4e20) Reviewed-by: Jani Heikkinen --- coin/platform_configs/qt5.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 20569d1c..798c7d86 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -16,9 +16,9 @@ qtci-macos-10.12-x86_64-8 Android_ANY armv7 GCC Packagin qtci-macos-10.12-x86_64-8 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 qtci-linux-RHEL-6.6-x86_64 QNX_660 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-macos-10.12-x86_64-8 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static -qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw53 Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 QNX_700 x86 Mingw53 Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw53 Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-10 QNX_700 x86 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-windows-10-x86_64-10 QNX_660 armv7 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-windows-10-x86_64-10 QNX_660 x86 Mingw53 Packaging Release DisableTests OpenGLES2 -qtci-linux-RHEL-7.4-x86_64 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-linux-RHEL-7.4-x86_64 QNX_700 armv7 GCC Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.4-x86_64 QNX_700 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.4-x86_64 QNX_700 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker From 85c2dae031da386e61e425a4c0660544af783afb Mon Sep 17 00:00:00 2001 From: Samuli Piippo Date: Tue, 8 May 2018 15:04:38 +0300 Subject: [PATCH 3/7] Change QNX7 x86 release builds to x86_64 Task-number: QTBUG-67746 Change-Id: I677019909d56d8b227f0607069cbf3ab0cf7fec3 Reviewed-by: Jani Heikkinen (cherry picked from commit 1c8ff381be103c91f552bd461b794cbf1a590f98) --- coin/platform_configs/qt5.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 798c7d86..a312410b 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -17,8 +17,8 @@ qtci-macos-10.12-x86_64-8 Android_ANY x86 GCC Packagin qtci-linux-RHEL-6.6-x86_64 QNX_660 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-macos-10.12-x86_64-8 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw53 Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 QNX_700 x86 Mingw53 Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-10 QNX_700 x86_64 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-windows-10-x86_64-10 QNX_660 armv7 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-windows-10-x86_64-10 QNX_660 x86 Mingw53 Packaging Release DisableTests OpenGLES2 -qtci-linux-RHEL-7.4-x86_64 QNX_700 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-linux-RHEL-7.4-x86_64 QNX_700 x86_64 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-RHEL-7.4-x86_64 QNX_700 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker From 80e212306551bcab5bbc35c4be75c015a5c20361 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 22 May 2018 22:53:37 +0200 Subject: [PATCH 4/7] Update submodules on '5.9.6' in qt5 Change-Id: I4b5695046233f88bbfe41b628acc1ea694e5fe98 Reviewed-by: Liang Qi --- qtbase | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtqa | 2 +- qtwebengine | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qtbase b/qtbase index 5a79a9ea..f24bd1b8 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 5a79a9ea41ab1223edc39b6c594a682cb079dd18 +Subproject commit f24bd1b8183ec9cc4e239dc560072d3896ec61a1 diff --git a/qtdeclarative b/qtdeclarative index b5bc53a1..047e3f48 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit b5bc53a1cb26968414282245bb72460b29dd87d2 +Subproject commit 047e3f480e9ebed55b21025f19ed7ed7351df118 diff --git a/qtlocation b/qtlocation index 4f8604bf..11606448 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 4f8604bf7a94e64f40f5bb769d2105ca4e2f8e9b +Subproject commit 1160644877a334c4cff608ae1386d2fa8ade6eee diff --git a/qtqa b/qtqa index 46daf8aa..79f009af 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 46daf8aac235107d0c77fe3a887ecb73f85b4159 +Subproject commit 79f009afd8ee0ad1c032f2235e09971ac1b5c376 diff --git a/qtwebengine b/qtwebengine index 5c25c3ca..987a2de5 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 5c25c3cac58e07c25fe438e61d5eccda7227ede4 +Subproject commit 987a2de5c39e66001d2754d6a06475c4098b703e From eeb9fc412991e25e873eba8c08836a89637f0a29 Mon Sep 17 00:00:00 2001 From: Joni Jantti Date: Mon, 9 Apr 2018 11:07:08 +0300 Subject: [PATCH 5/7] Provisioning: Ubuntu - Add QNX 6.6.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit QNX 6.6.0 is required by RTA. Task-number: QTQAINFRA-1914 Change-Id: Id0578050d24fb13f3e10a10e972be790d39f9bc0 Reviewed-by: Tony Sarajärvi (cherry picked from commit e8a60ed41bb838f40558ac39e496b4a1e32e9140) --- coin/provisioning/common/linux/qnx_660.sh | 66 +++++++++++++++++++ .../60-qnx660.sh | 38 +++++++++++ 2 files changed, 104 insertions(+) create mode 100755 coin/provisioning/common/linux/qnx_660.sh create mode 100755 coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/60-qnx660.sh diff --git a/coin/provisioning/common/linux/qnx_660.sh b/coin/provisioning/common/linux/qnx_660.sh new file mode 100755 index 00000000..7f6ab063 --- /dev/null +++ b/coin/provisioning/common/linux/qnx_660.sh @@ -0,0 +1,66 @@ +#!/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 installs QNX 6.6.0. + +set -ex + +source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" + +targetFolder="/opt/" +sourceFile="http://ci-files01-hki.intra.qt.io/input/qnx/linux/qnx660.tar.gz" +sha1="E292CCAEF447AC1AA4DAD7802D604A5531ACD8D0" +folderName="qnx660" +targetFile="qnx660.tar.gz" +wget --tries=5 --waitretry=5 --progress=dot:giga --output-document="$targetFile" "$sourceFile" +echo "$sha1 $targetFile" | sha1sum --check +if [ ! -d "$targetFolder" ]; then + mkdir -p $targetFolder +fi +sudo tar -C $targetFolder -xvzf $targetFile +sudo chown -R qt:users "$targetFolder"/"$folderName" + +# Verify that we have last file in tar +if [ ! -f $targetFolder/$folderName/qnx660-env.sh ]; then + echo "Installation failed!" + exit -1 +fi + +rm -rf $targetFile + +# Set env variables +SetEnvVar "QNX_660" "$targetFolder$folderName" + +echo "QNX SDP = 6.6.0" >> ~/versions.txt diff --git a/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/60-qnx660.sh b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/60-qnx660.sh new file mode 100755 index 00000000..6b5cf23c --- /dev/null +++ b/coin/provisioning/qtci-linux-Ubuntu-16.04-x86_64/60-qnx660.sh @@ -0,0 +1,38 @@ +#!/bin/env bash + +############################################################################# +## +## Copyright (C) 2018 The Qt Company Ltd. +## Contact: http://www.qt.io/licensing/ +## +## This file is part of the test suite of the Qt Toolkit. +## +## $QT_BEGIN_LICENSE:LGPL21$ +## Commercial License Usage +## Licensees holding valid commercial Qt licenses may use this file in +## accordance with the commercial license agreement provided with the +## Software or, alternatively, in accordance with the terms contained in +## a written agreement between you and The Qt Company. For licensing terms +## and conditions see http://www.qt.io/terms-conditions. For further +## information use the contact form at http://www.qt.io/contact-us. +## +## GNU Lesser General Public License Usage +## Alternatively, this file may be used under the terms of the GNU Lesser +## General Public License version 2.1 or version 3 as published by the Free +## Software Foundation and appearing in the file LICENSE.LGPLv21 and +## LICENSE.LGPLv3 included in the packaging of this file. Please review the +## following information to ensure the GNU Lesser General Public License +## requirements will be met: https://www.gnu.org/licenses/lgpl.html and +## http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +## +## As a special exception, The Qt Company gives you certain additional +## rights. These rights are described in The Qt Company LGPL Exception +## version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +## +## $QT_END_LICENSE$ +## +############################################################################# + +set -ex + +source "${BASH_SOURCE%/*}/../common/linux/qnx_660.sh" From 1cf6f1a8cb44c1144fc92fe4b29393a87d6cc3e4 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 1 Jun 2018 16:03:47 +0300 Subject: [PATCH 6/7] Update submodules on '5.9.6' in qt5 Change-Id: I16a75e0ecbc01f944165a6a47f453c2aca82a837 Reviewed-by: Jani Heikkinen --- 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 +- qtpurchasing | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtscript | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtsvg | 2 +- qttools | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 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 3fc080b6..ea18da83 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 3fc080b6bdacc440efae453413dd8053bbecacf5 +Subproject commit ea18da8361e8406cf1cb567a407429afcd65552a diff --git a/qtactiveqt b/qtactiveqt index 0ae99f09..ab427187 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit 0ae99f0961f89517c9b5db81c892b143336b09c8 +Subproject commit ab4271873f93fa757c1fa1c1ae2eea58c5dcbab4 diff --git a/qtandroidextras b/qtandroidextras index cdc31401..5dade229 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit cdc314011e3fbbb603a1219844282ce48e485a6c +Subproject commit 5dade229ca69cb8a09fcae20c9a23db3f3057fdd diff --git a/qtbase b/qtbase index f24bd1b8..4e68ad5f 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit f24bd1b8183ec9cc4e239dc560072d3896ec61a1 +Subproject commit 4e68ad5f120f9c883ad5fde5a68278ba3b01e8e3 diff --git a/qtcanvas3d b/qtcanvas3d index 5b920d86..569495de 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 5b920d86dbc00f05f5679bcf8fe9ee1ba19b06f7 +Subproject commit 569495de338821ad89153b69a59a5364fc96a49a diff --git a/qtcharts b/qtcharts index 6f30d296..6acb93f0 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit 6f30d2969addd350247c5a6c3572f8bb6161339e +Subproject commit 6acb93f08af0133d3230cd7f9db5f9e0146d7fbf diff --git a/qtconnectivity b/qtconnectivity index b88b57c5..513e69bd 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit b88b57c56b14c88dce83d7c267b5d52d18fd784a +Subproject commit 513e69bd6aca390d7e6ef28d3527c24dee99ee2b diff --git a/qtdatavis3d b/qtdatavis3d index c3c6e604..4d2efb91 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit c3c6e604ee1193deb1bbff8e6f26ea2aeefdbe91 +Subproject commit 4d2efb91ebbdc08ca70ee63a479367d75d5a6357 diff --git a/qtdeclarative b/qtdeclarative index 047e3f48..283a900c 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 047e3f480e9ebed55b21025f19ed7ed7351df118 +Subproject commit 283a900c4e8518fef33a2c89cb597fbf1e6ad78c diff --git a/qtdoc b/qtdoc index f9fcff9e..a7861396 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit f9fcff9e781e53860d3d73cb581f1ffbf14b4106 +Subproject commit a78613965f257b092a555683d8f225c61cfb160e diff --git a/qtgamepad b/qtgamepad index d1054b8e..91b69225 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit d1054b8e44d17ecbfae3cd455e07d6c379ef099a +Subproject commit 91b692255f5cb7012000694ff46ea0346293baf5 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index c9a0a0f6..f61dcaa5 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit c9a0a0f661d5ce789e5ab6743782afa463dd289a +Subproject commit f61dcaa5e5ef8f5da1b37b25e4bd17469e72ce55 diff --git a/qtimageformats b/qtimageformats index bcc376e4..e9daef6d 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit bcc376e41f1e99a16bcf9c86b0d8112dd2010b52 +Subproject commit e9daef6d8f60015906c1e62e2875b2b6c1494465 diff --git a/qtlocation b/qtlocation index 11606448..b0dd210c 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 1160644877a334c4cff608ae1386d2fa8ade6eee +Subproject commit b0dd210c2dccd7c1c295cc8cba9872fae6dffe54 diff --git a/qtmacextras b/qtmacextras index cf413fec..7750febd 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit cf413fec4eec10a68f146e40369c64859b0540b5 +Subproject commit 7750febd322dac0224f84c03271f9e0c08ff1bc9 diff --git a/qtmultimedia b/qtmultimedia index 82789905..52f5785c 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 82789905f291033504427a1406da430d744fe843 +Subproject commit 52f5785cfa8193f85859a27caebeb2a10f894f67 diff --git a/qtpurchasing b/qtpurchasing index 2c67f36d..064be102 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 2c67f36dc86e2fce6d802a52ae9d5e54b1f53aaa +Subproject commit 064be1023057f83244dba7342978026897fddf0f diff --git a/qtqa b/qtqa index 79f009af..82a3dfd8 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit 79f009afd8ee0ad1c032f2235e09971ac1b5c376 +Subproject commit 82a3dfd8a6cda7d30389af92163e82e1d34fae73 diff --git a/qtquickcontrols b/qtquickcontrols index 75e9561d..ca6bba71 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit 75e9561d4fdf8e94c6d556b9a37bdccdaaf80c10 +Subproject commit ca6bba7163850222ea8b71dd7db9c70de56a0d4e diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 9a295060..c48b314e 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 9a2950600087b0784b06b0521b409fce69960a2d +Subproject commit c48b314edef0595fbfa16dc62ce38b8d615326c8 diff --git a/qtscript b/qtscript index 945a4b0a..bc1c3fb9 160000 --- a/qtscript +++ b/qtscript @@ -1 +1 @@ -Subproject commit 945a4b0ad718a3462660a9782d0a78974a0d8cb9 +Subproject commit bc1c3fb95cee0ee525642bd308abbff21572505e diff --git a/qtscxml b/qtscxml index e5bfed81..320735f9 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit e5bfed810cdceedb8b7597d03c9649cddf9a5f3f +Subproject commit 320735f9a43bd07e4c2b8e9019b5706b00475956 diff --git a/qtsensors b/qtsensors index b50891d2..30044c5a 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit b50891d2d5c8677622eba5f2bb86af7be093c434 +Subproject commit 30044c5a4a1be9553c3db7a3669acd07431b2512 diff --git a/qtserialbus b/qtserialbus index 80d0443a..6654d887 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 80d0443a305d4787687d22a0ad8bdb0fcff96ccd +Subproject commit 6654d88750cf5431086fe1d3187ec87f52533b18 diff --git a/qtserialport b/qtserialport index e40bf534..0a242c49 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit e40bf5347cb9298cafdb1004366ab436c1493cfe +Subproject commit 0a242c49401571d6a5a294935af02c431cc32143 diff --git a/qtsvg b/qtsvg index 24273f15..7a28db8f 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 24273f154a4e4930d233e6711cbf718887576002 +Subproject commit 7a28db8f5bc0149eee67479c1e58d20a7a02be73 diff --git a/qttools b/qttools index 0c112f59..c9eeabc7 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 0c112f5980a39d370a90c34f8dfb778a6bd6a780 +Subproject commit c9eeabc7a7f83eb5603cedf7336f50e089d025af diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 5c9ce0ad..3fd388fe 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 5c9ce0adf6ef8b28bc6196326f711a9d039738ea +Subproject commit 3fd388fe385ba7941a77e6a27c9b1e0e57f07198 diff --git a/qtwayland b/qtwayland index 9e57a361..8c599964 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 9e57a3615f1ccde467d32cdaf71b02d7b6e72f8a +Subproject commit 8c5999644c8a98dca74f7339c2c750dd063ae346 diff --git a/qtwebchannel b/qtwebchannel index a9f8d06f..56a155e6 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit a9f8d06fe1a7e98f1fa38d8df1627dc66dc92c21 +Subproject commit 56a155e68de96a80301ef8b9ad183fcb67e86142 diff --git a/qtwebengine b/qtwebengine index 987a2de5..cc526afe 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 987a2de5c39e66001d2754d6a06475c4098b703e +Subproject commit cc526afe9c2cdd4502c90b8f9b505812c984ea08 diff --git a/qtwebsockets b/qtwebsockets index 74ea21a4..3dc383a8 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 74ea21a46daa8c8e3c1814ec517e360cb9503a9e +Subproject commit 3dc383a8078d7478a230ca7acac922b373bb9930 diff --git a/qtwebview b/qtwebview index 4acd68bc..acc015e1 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 4acd68bc1c8b97c3764442d95515c10d226e564b +Subproject commit acc015e1cad69aa1a5224f6a3dcafa79df3a9286 diff --git a/qtwinextras b/qtwinextras index 21746839..0f6fab0d 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 2174683966e367a3c1e33eea18df1cb124aaaf86 +Subproject commit 0f6fab0d89fdcf1868f9f5d2d2f75801a4c6eaa1 diff --git a/qtx11extras b/qtx11extras index 4644f175..b51ac2d4 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 4644f175b9abbe770818a77e058f08b888f6e8b7 +Subproject commit b51ac2d46ca54769e242702f87bc6762f9f68ea9 diff --git a/qtxmlpatterns b/qtxmlpatterns index 3444bfc8..4dcae15a 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 3444bfc8039c5090b02fd7f98abe8064a73019d7 +Subproject commit 4dcae15a5a7f848addfb1b6bc2a98a63dc7218b4 From bb59a6bfcbd6f209e307d4e7cb2bb228baf228ea Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 7 Jun 2018 06:09:03 +0300 Subject: [PATCH 7/7] Update submodules on '5.9.6' in qt5 Change-Id: I56e07a48063b65c9a4ab961b10415642d2d1fa72 Reviewed-by: Jani Heikkinen --- qtbase | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtbase b/qtbase index 4e68ad5f..9c501123 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 4e68ad5f120f9c883ad5fde5a68278ba3b01e8e3 +Subproject commit 9c50112304033c631e52f062496f3111f24835a2