From c33f28bc0593e5b3f16848d4eed4790aa45de0c2 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 26 Apr 2017 20:11:25 +0200 Subject: [PATCH 01/11] Update submodules on '5.6' in qt5 Change-Id: Iadc5070366d65f98c81af02f4926c2ebfb1ae294 Reviewed-by: Liang Qi --- qtdeclarative | 2 +- qttools | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtdeclarative b/qtdeclarative index f76dd50d..2da8e40f 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit f76dd50d42b91234dcb7c0ea0775382e369f11ae +Subproject commit 2da8e40fe22396eec158c160ac75ab23d4a0abd8 diff --git a/qttools b/qttools index 64e99958..a4f65612 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 64e99958f358003092cdf455eec89c08cf3b6fd1 +Subproject commit a4f656126803b6cfac8ac4b442ee975562145b73 From 2715a17c9bbe35738549fcb9fec92ad965fae072 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 8 Dec 2016 15:46:06 +0100 Subject: [PATCH 02/11] get rid of custom 'qt' gitmodules property MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit instead, re-use the (also custom) 'project' property with the magic value '-' to flag modules which contain no project files at all. Change-Id: I33163c098852e1b79ad698115aac98217efe1157 Reviewed-by: Frederik Gladhorn Reviewed-by: Jędrzej Nowacki Reviewed-by: Joerg Bornemann Reviewed-by: Aapo Keskimolo Reviewed-by: Eike Ziller Reviewed-by: Iikka Eklund Reviewed-by: Jake Petroules --- .gitmodules | 2 +- qt.pro | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index b4d74220..9e391985 100644 --- a/.gitmodules +++ b/.gitmodules @@ -68,7 +68,7 @@ url = ../qtrepotools.git branch = master status = essential - qt = false + project = - [submodule "qtwebkit"] depends = qtbase recommends = qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel qtxmlpatterns diff --git a/qt.pro b/qt.pro index bf510fab..825e6b51 100644 --- a/qt.pro +++ b/qt.pro @@ -29,7 +29,8 @@ QMAKE_INTERNAL_INCLUDED_FILES += $$PWD/.gitmodules modules = $$sort_depends(modules, module., .depends .recommends .serialize) modules = $$reverse(modules) for (mod, modules) { - equals(module.$${mod}.qt, false): \ + project = $$eval(module.$${mod}.project) + equals(project, -): \ next() deps = $$eval(module.$${mod}.depends) @@ -43,7 +44,6 @@ for (mod, modules) { !isEmpty(QT_BUILD_MODULES):!contains(QT_BUILD_MODULES, $$mod): \ next() - project = $$eval(module.$${mod}.project) isEmpty(project) { !exists($$mod/$${mod}.pro): \ next() From 8325f2bde99910c26077ab4321046f42489261bb Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Thu, 27 Apr 2017 12:34:03 +0200 Subject: [PATCH 03/11] Adjust submodule branches Change-Id: I6989e17a9b33cf69863ce80fb1b1011d2223f951 --- .gitmodules | 82 ++++++++++++++++++++++++++--------------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/.gitmodules b/.gitmodules index 8be71f45..4756d07d 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,66 +1,66 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.9 + branch = 5.9.0 status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = 5.9 + branch = 5.9.0 status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg qtxmlpatterns path = qtdeclarative url = ../qtdeclarative.git - branch = 5.9 + branch = 5.9.0 status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = 5.9 + branch = 5.9.0 status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = 5.9 + branch = 5.9.0 status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = 5.9 + branch = 5.9.0 status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt qtwebkit path = qttools url = ../qttools.git - branch = 5.9 + branch = 5.9.0 status = essential [submodule "qtxmlpatterns"] depends = qtbase path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.9 + branch = 5.9.0 status = addon [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = 5.9 + branch = 5.9.0 status = essential priority = 30 [submodule "qtdoc"] depends = qtdeclarative path = qtdoc url = ../qtdoc.git - branch = 5.9 + branch = 5.9.0 status = essential priority = 40 [submodule "qtrepotools"] @@ -74,7 +74,7 @@ recommends = qtdeclarative qtlocation qtmultimedia qtsensors qtwebchannel qtxmlpatterns path = qtwebkit url = ../qtwebkit.git - branch = 5.9 + branch = 5.9.0 status = obsolete project = WebKit.pro priority = 20 @@ -82,7 +82,7 @@ depends = qtwebkit qttools path = qtwebkit-examples url = ../qtwebkit-examples.git - branch = 5.9 + branch = 5.9.0 status = obsolete [submodule "qtqa"] depends = qtbase @@ -96,14 +96,14 @@ recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport path = qtlocation url = ../qtlocation.git - branch = 5.9 + branch = 5.9.0 status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = 5.9 + branch = 5.9.0 status = addon [submodule "qtsystems"] depends = qtbase @@ -136,27 +136,27 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = 5.9 + branch = 5.9.0 status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = 5.9 + branch = 5.9.0 status = addon [submodule "qt3d"] depends = qtdeclarative qtimageformats recommends = qtgamepad path = qt3d url = ../qt3d.git - branch = 5.9 + branch = 5.9.0 status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = 5.9 + branch = 5.9.0 status = addon [submodule "qtquick1"] depends = qtscript @@ -169,51 +169,51 @@ depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.9 + branch = 5.9.0 status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.9 + branch = 5.9.0 status = essential [submodule "qtserialbus"] depends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 5.9 + branch = 5.9.0 status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = 5.9 + branch = 5.9.0 status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = 5.9 + branch = 5.9.0 status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = 5.9 + branch = 5.9.0 status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = 5.9 + branch = 5.9.0 status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = 5.9 + branch = 5.9.0 status = addon [submodule "qtenginio"] depends = qtdeclarative @@ -226,14 +226,14 @@ recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = 5.9 + branch = 5.9.0 status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = 5.9 + branch = 5.9.0 status = addon [submodule "qtwebengine"] depends = qtquickcontrols qtwebchannel @@ -241,86 +241,86 @@ serialize = qtwebkit path = qtwebengine url = ../qtwebengine.git - branch = 5.9 + branch = 5.9.0 status = addon priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative path = qtcanvas3d url = ../qtcanvas3d.git - branch = 5.9 + branch = 5.9.0 status = addon [submodule "qtwebview"] depends = qtdeclarative recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = 5.9 + branch = 5.9.0 status = addon [submodule "qtquickcontrols2"] depends = qtgraphicaleffects path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = 5.9 + branch = 5.9.0 status = addon [submodule "qtpurchasing"] depends = qtbase qtandroidextras recommends = qtdeclarative path = qtpurchasing url = ../qtpurchasing.git - branch = 5.9 + branch = 5.9.0 status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = 5.9 + branch = 5.9.0 status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = 5.9 + branch = 5.9.0 status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = 5.9 + branch = 5.9.0 status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad - branch = 5.9 + branch = 5.9.0 status = addon [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml - branch = 5.9 + branch = 5.9.0 status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech url = ../qtspeech - branch = 5.9 + branch = 5.9.0 status = preview [submodule "qtnetworkauth"] depends = qtbase recommends = qtwebview path = qtnetworkauth url = ../qtnetworkauth - branch = 5.9 + branch = 5.9.0 status = preview [submodule "qtremoteobjects"] depends = qtbase path = qtremoteobjects url = ../qtremoteobjects - branch = 5.9 + branch = 5.9.0 status = preview From a4a7f71f37843d6f0809855ba443541faa3cdc87 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Tue, 2 May 2017 21:25:34 +0300 Subject: [PATCH 04/11] MSVC 2017 updated and missing component for winrt arm MSVC 2017 and Build Tools updated to version 15.1. Also missing component 'Visual C++ compilers and libraries for ARM' installed for winrt arm Also script added to storage msvc version numbers to versions.txt Change-Id: I015e15d5d613b178c1266a2aecee5c3270780486 Reviewed-by: Simon Hausmann --- coin/platform_configs/default.txt | 4 +- coin/platform_configs/qt5.txt | 6 +-- .../qtci-windows-10-x86/msvc2017.ps1 | 2 +- .../qtci-windows-10-x86_64/msvc2017.ps1 | 2 +- .../provisioning/qtci-windows-10-x86/msvc.ps1 | 43 +++++++++++++++++++ .../qtci-windows-10-x86_64/msvc.ps1 | 43 +++++++++++++++++++ 6 files changed, 93 insertions(+), 7 deletions(-) create mode 100644 coin/provisioning/qtci-windows-10-x86/msvc.ps1 create mode 100644 coin/provisioning/qtci-windows-10-x86_64/msvc.ps1 diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 917a8323..4ac819c4 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -6,8 +6,8 @@ qtci-windows-8-x86-2 MSVC2013 qtci-windows-8-x86_64-2 MSVC2013 Packaging DebugAndRelease Release OpenGLDynamic qtci-windows-7-x86-2 MSVC2010 Release DeveloperBuild QtNamespace QtLibInfix OpenGLDynamic qtci-windows-7-x86-2 Mingw49 Packaging DebugAndRelease Release OpenGLDynamic -qtci-windows-10-x86-5 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic -qtci-windows-10-x86_64-6 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic +qtci-windows-10-x86-6 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic +qtci-windows-10-x86_64-7 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic qtci-windows-8-x86_64-2 Windows_Phone_8_1 armv4 MSVC2013 Packaging DebugAndRelease Release DisableTests qtci-windows-8-x86_64-2 WinRT_8_1 MSVC2013 Packaging DebugAndRelease Release DisableTests qtci-linux-Ubuntu-14.04-x86_64 GCC NoWidgets ForceDebugInfo diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 77e98693..77668039 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -1,8 +1,8 @@ Template Target OS Target arch Compiler Features --------------------------- ------------------- ----------- ----------- ----------------------------------------------------------------------------------------------- qtci-windows-8-x86_64-2 Windows_Phone_8_1 x86 MSVC2013 Packaging DebugAndRelease Release DisableTests -qtci-windows-10-x86_64-6 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release DisableTests -qtci-windows-10-x86_64-6 WinRT_10 MSVC2015 Packaging DebugAndRelease Release DisableTests +qtci-windows-10-x86_64-7 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release DisableTests +qtci-windows-10-x86_64-7 WinRT_10 MSVC2015 Packaging DebugAndRelease Release DisableTests qtci-linux-RHEL-6.6-x86_64 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-windows-7-x86-2 Android_ANY armv7 Mingw49 Packaging Release DisableTests OpenGLES2 qtci-windows-7-x86-2 Android_ANY x86 Mingw49 Packaging Release DisableTests OpenGLES2 @@ -12,6 +12,6 @@ qtci-linux-RHEL-6.6-x86_64 QNX_660 x86 GCC Packagin qtci-windows-7-x86-2 QNX_660 armv7 Mingw49 Packaging Release DisableTests OpenGLES2 qtci-windows-7-x86-2 QNX_660 x86 Mingw49 Packaging Release DisableTests OpenGLES2 # target arch is used here only for documentation the value is ignored -qtci-windows-10-x86_64-6 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release DisableTests +qtci-windows-10-x86_64-7 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release DisableTests qtci-osx-10.11-x86_64 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static diff --git a/coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps1 b/coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps1 index 46675c23..01442324 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps1 +++ b/coin/pre-provisioning/qtci-windows-10-x86/msvc2017.ps1 @@ -43,7 +43,7 @@ $msvcPackage = "C:\Windows\Temp\$version.exe" Download $url_cache $url_cache $msvcPackage Verify-Checksum $msvcPackage $sha1 -cmd /c "$msvcPackage --all --norestart --quiet --wait" +cmd /c "$msvcPackage --all --norestart --quiet --wait --add Microsoft.VisualStudio.Component.VC.Tools.ARM" echo "Cleaning $msvcPackage.." Remove-Item -Recurse -Force "$msvcPackage" echo "Visual Studio = $version" >> ~\versions.txt diff --git a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1 b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1 index 46675c23..01442324 100644 --- a/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1 +++ b/coin/pre-provisioning/qtci-windows-10-x86_64/msvc2017.ps1 @@ -43,7 +43,7 @@ $msvcPackage = "C:\Windows\Temp\$version.exe" Download $url_cache $url_cache $msvcPackage Verify-Checksum $msvcPackage $sha1 -cmd /c "$msvcPackage --all --norestart --quiet --wait" +cmd /c "$msvcPackage --all --norestart --quiet --wait --add Microsoft.VisualStudio.Component.VC.Tools.ARM" echo "Cleaning $msvcPackage.." Remove-Item -Recurse -Force "$msvcPackage" echo "Visual Studio = $version" >> ~\versions.txt diff --git a/coin/provisioning/qtci-windows-10-x86/msvc.ps1 b/coin/provisioning/qtci-windows-10-x86/msvc.ps1 new file mode 100644 index 00000000..1de57a66 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86/msvc.ps1 @@ -0,0 +1,43 @@ +############################################################################# +## +## 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$ +## +############################################################################# + +# Visual Studios are pre-provisioned to tier1 images + +# MSVC 2015 Update 3 +echo "Visual Studio 2015 = Version 14.0.25421.3 Update 3" >> ~\versions.txt + +# MSVC 2017 +echo "Visual Studio 2017 = Version 15.1 (26403.7)" >> ~\versions.txt + +# MSVC 2017 Build Tools +echo "Visual Studio 2017 Build Tools = Version 15.1 (26403.7)" >> ~\versions.txt diff --git a/coin/provisioning/qtci-windows-10-x86_64/msvc.ps1 b/coin/provisioning/qtci-windows-10-x86_64/msvc.ps1 new file mode 100644 index 00000000..1de57a66 --- /dev/null +++ b/coin/provisioning/qtci-windows-10-x86_64/msvc.ps1 @@ -0,0 +1,43 @@ +############################################################################# +## +## 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$ +## +############################################################################# + +# Visual Studios are pre-provisioned to tier1 images + +# MSVC 2015 Update 3 +echo "Visual Studio 2015 = Version 14.0.25421.3 Update 3" >> ~\versions.txt + +# MSVC 2017 +echo "Visual Studio 2017 = Version 15.1 (26403.7)" >> ~\versions.txt + +# MSVC 2017 Build Tools +echo "Visual Studio 2017 Build Tools = Version 15.1 (26403.7)" >> ~\versions.txt From 73a9754842ed005229e6edc170fca346e0664588 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Fri, 5 May 2017 13:07:19 +0300 Subject: [PATCH 05/11] Update submodules on '5.9.0' in qt5 Change-Id: I3d17d880ce8a5ef4180cdbfb163df8d4f07a0398 Reviewed-by: Liang Qi --- qt3d | 2 +- qtactiveqt | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgamepad | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtnetworkauth | 2 +- qtpurchasing | 2 +- qtqa | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtrepotools | 2 +- qtscxml | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qttools | 2 +- qttranslations | 2 +- qtvirtualkeyboard | 2 +- qtwayland | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- qtwinextras | 2 +- qtxmlpatterns | 2 +- 33 files changed, 33 insertions(+), 33 deletions(-) diff --git a/qt3d b/qt3d index a2b7483f..6e5acfcc 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit a2b7483fa18e109011246fba5e7963338a77af56 +Subproject commit 6e5acfcce3c287c30bab4cdc6fc5f7545a15255e diff --git a/qtactiveqt b/qtactiveqt index dfc34ee5..0dd18e45 160000 --- a/qtactiveqt +++ b/qtactiveqt @@ -1 +1 @@ -Subproject commit dfc34ee575ca7790ec403c6510a9ccc469c07997 +Subproject commit 0dd18e45cc9fafac2091ad699e2f833124467615 diff --git a/qtbase b/qtbase index b1131074..464a43d4 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit b1131074199aae97b2a005cba871f6baf2a32c63 +Subproject commit 464a43d43c2bb2440d4ad745bc134e0dac10872c diff --git a/qtcanvas3d b/qtcanvas3d index 08458d0d..6717956e 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 08458d0dcfba8421c03ed9c7dec7435619f0b70d +Subproject commit 6717956ed4b886defbb158b46b6ab572984c0891 diff --git a/qtcharts b/qtcharts index cc4e79d6..b7ded4e4 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit cc4e79d6200b0495a5c4d1a7faa773906b1ac99e +Subproject commit b7ded4e4216987d28be92cf8309a38c6dc18961b diff --git a/qtconnectivity b/qtconnectivity index 5391a325..ec0fb110 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit 5391a325eadcee86a494aa96a3f8edae1be55556 +Subproject commit ec0fb110eccb237a230fec61e02740de9c74fe1f diff --git a/qtdatavis3d b/qtdatavis3d index 73ec35fa..1a1dc5ab 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 73ec35fa12a4b150670ea93d3021ca8e658063e1 +Subproject commit 1a1dc5abdbc15a61e9447d9a4f0b32337a61202f diff --git a/qtdeclarative b/qtdeclarative index 93bc4113..c6748dde 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit 93bc4113f06dce4c942374d765bef20054cd1f94 +Subproject commit c6748dde37e12339cff209d6b0e05071679d4824 diff --git a/qtdoc b/qtdoc index f1555216..aedbb438 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit f155521639b9970effddca1244b98558ed4db70b +Subproject commit aedbb438e365f8eca29f363c02e09c54c50ccbfb diff --git a/qtgamepad b/qtgamepad index 36846eca..ef8850fe 160000 --- a/qtgamepad +++ b/qtgamepad @@ -1 +1 @@ -Subproject commit 36846eca9ae810d213b2fe2ae5d9ff11137d4597 +Subproject commit ef8850fee38e2552d535379a8477c9abebdf8bb4 diff --git a/qtimageformats b/qtimageformats index c7a6a451..2dae7743 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit c7a6a451a5c277556e28dfb3b4b943719cdda7ff +Subproject commit 2dae77433f2820abd352d1bb696bee63d787eb99 diff --git a/qtlocation b/qtlocation index c2691cf4..acb1f42d 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit c2691cf479c88ba0f74492195912cd9b62ce4e62 +Subproject commit acb1f42d21b94c4c783433c2e7d67646c905afb7 diff --git a/qtmacextras b/qtmacextras index a26ed957..3d3ca5a1 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit a26ed9570c95f2315a2fc0b0f58d2cfebe955a00 +Subproject commit 3d3ca5a13c6a35883f5bfa3175a8f1ae00dfaa0d diff --git a/qtmultimedia b/qtmultimedia index 6b20032d..960fbf08 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 6b20032d91067e06f6ab5d4acf553812134236c7 +Subproject commit 960fbf083be4391314e8fe36994a133763dbbe7d diff --git a/qtnetworkauth b/qtnetworkauth index aeb49ab5..86c50368 160000 --- a/qtnetworkauth +++ b/qtnetworkauth @@ -1 +1 @@ -Subproject commit aeb49ab5e1d7ebe2aaff6579757dacae45579c84 +Subproject commit 86c5036848ad004208803d9d497cfcd08c9623d6 diff --git a/qtpurchasing b/qtpurchasing index eb81ec29..08b5290b 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit eb81ec29b71d33696ff504834070c3b0a6d7c2e5 +Subproject commit 08b5290b67df7b9f077b85069d1e19662e8c3847 diff --git a/qtqa b/qtqa index b8198f71..a6064652 160000 --- a/qtqa +++ b/qtqa @@ -1 +1 @@ -Subproject commit b8198f71d579f488d18e0bb7ef72c10f6a861ef6 +Subproject commit a606465231a4f8e94815e5a6657f608fd283290a diff --git a/qtquickcontrols b/qtquickcontrols index ffc1cab2..a218356f 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit ffc1cab21ade6fc4b0ab574dbb5507c677d32841 +Subproject commit a218356f838c4be8aad8f447e8d6187a8af639ff diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 7faafa47..932d5f78 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 7faafa470eee71c51255e276e7b9df5beed2dd5b +Subproject commit 932d5f78296e604c57c8ebcfe5c94f5ce62238f4 diff --git a/qtremoteobjects b/qtremoteobjects index 2b6c91ff..d0b7ce30 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit 2b6c91ff99401305a38687ae252d70c5227d293a +Subproject commit d0b7ce30d3a99a751581147b647072cfbae9d321 diff --git a/qtrepotools b/qtrepotools index 91471704..59e404b2 160000 --- a/qtrepotools +++ b/qtrepotools @@ -1 +1 @@ -Subproject commit 91471704ad8d97bb1d16077e160f23eec45738d3 +Subproject commit 59e404b2f2628ca3f4e8104ec55c7409f9db90f3 diff --git a/qtscxml b/qtscxml index 384cb797..958d4d8e 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 384cb7975d9caa4e508454d811d2e391763e5981 +Subproject commit 958d4d8ecfc7afcbc9b7c0855857d2a2e1cbfa9f diff --git a/qtserialbus b/qtserialbus index 0ac7bc6e..f9cd9f7d 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit 0ac7bc6e57be2a7c2ee14bfaf7489e20daf3edc0 +Subproject commit f9cd9f7da643274e0c39fd62b8b12a6a83fc203d diff --git a/qtserialport b/qtserialport index d320f010..d88ded29 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit d320f01018f0273e4fea2e0a7aa8f30ee8129587 +Subproject commit d88ded29d968b8ccf41d4dffa73c3f8f030a9f5d diff --git a/qttools b/qttools index 1a7bc520..15db04e5 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 1a7bc520c5df4da80b7e65acbec1f546f9c87870 +Subproject commit 15db04e57cf8bcc2ba2fa3248a2928b23f4667ab diff --git a/qttranslations b/qttranslations index 1b2c07c5..03747bd6 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 1b2c07c5fe056321586ce0b4e334398d77505a65 +Subproject commit 03747bd6edba87edd148e33698b439bc2e7aac5a diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index bfa8da56..0b29698c 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit bfa8da56b1edd77ec416c24b96d33db94368be80 +Subproject commit 0b29698c74b053bbe47404fe01ed5c3c6ce79acf diff --git a/qtwayland b/qtwayland index e9bf98d2..79c4e329 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit e9bf98d2bf8c1d5d4f671bcb6146ed13de213f01 +Subproject commit 79c4e3292bac9664bc4114e18ad28d4a468b69f5 diff --git a/qtwebengine b/qtwebengine index 61e35009..028bd20e 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 61e35009aa276e9d2d7ff1787b52ba06f8cde37f +Subproject commit 028bd20e41fc1995c34ca4c19e5342ff3efe0c6a diff --git a/qtwebsockets b/qtwebsockets index 91582c53..cec66b89 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit 91582c53c5c3b404169ce2a44d75ac8102043513 +Subproject commit cec66b8969215d7355aa61655e68893f7dad5595 diff --git a/qtwebview b/qtwebview index f7f8f8f6..0685dffb 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit f7f8f8f6c12b8617b4d9f89dd2aaaf241a1a6f8e +Subproject commit 0685dffb9275613e06f47e1d07643e55eeff56d9 diff --git a/qtwinextras b/qtwinextras index 7be0ff7f..c9fe5755 160000 --- a/qtwinextras +++ b/qtwinextras @@ -1 +1 @@ -Subproject commit 7be0ff7fe32ef01839de4ad0a8142ca05438b500 +Subproject commit c9fe5755bd18fd2cc6a310b69e1b81bc8ea8981e diff --git a/qtxmlpatterns b/qtxmlpatterns index da19c988..84ee5b9b 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit da19c9882295a8f3216284935c05ad4b89c445bd +Subproject commit 84ee5b9b2636a5d33852fc0fb114968c5fae1d1c From f5754fd722c981ca157e7c650ecd271c9077b7cc Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sun, 7 May 2017 12:18:27 +0300 Subject: [PATCH 06/11] Update submodules on '5.9.0' in qt5 Change-Id: I4d592c4749ad4ddd8a54ce186ae89682a564a5ba Reviewed-by: Liang Qi --- qt3d | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtvirtualkeyboard | 2 +- qtwebview | 2 +- qtx11extras | 2 +- qtxmlpatterns | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qt3d b/qt3d index 6e5acfcc..bb0f4b48 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 6e5acfcce3c287c30bab4cdc6fc5f7545a15255e +Subproject commit bb0f4b48390b5ddc9758f04f6ecd692072fb279f diff --git a/qtimageformats b/qtimageformats index 2dae7743..97f41980 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 2dae77433f2820abd352d1bb696bee63d787eb99 +Subproject commit 97f4198083ccdc61e5d8cbca8e19d5bef80936e2 diff --git a/qtlocation b/qtlocation index acb1f42d..6e276607 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit acb1f42d21b94c4c783433c2e7d67646c905afb7 +Subproject commit 6e276607e507f36bd94c33652071cf0413c6ba3a diff --git a/qtvirtualkeyboard b/qtvirtualkeyboard index 0b29698c..bdf61afe 160000 --- a/qtvirtualkeyboard +++ b/qtvirtualkeyboard @@ -1 +1 @@ -Subproject commit 0b29698c74b053bbe47404fe01ed5c3c6ce79acf +Subproject commit bdf61afe76e94ef03da1332c4540646f18f5852f diff --git a/qtwebview b/qtwebview index 0685dffb..821e338f 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 0685dffb9275613e06f47e1d07643e55eeff56d9 +Subproject commit 821e338f49cefb39816be29fb42c6b6c91bd94a2 diff --git a/qtx11extras b/qtx11extras index 8c44529e..9e83ff87 160000 --- a/qtx11extras +++ b/qtx11extras @@ -1 +1 @@ -Subproject commit 8c44529ed5269bc2130c27ba9733d262143424ed +Subproject commit 9e83ff8713c1a3f69ce514bf3e31335194668da7 diff --git a/qtxmlpatterns b/qtxmlpatterns index 84ee5b9b..c1c3af0a 160000 --- a/qtxmlpatterns +++ b/qtxmlpatterns @@ -1 +1 @@ -Subproject commit 84ee5b9b2636a5d33852fc0fb114968c5fae1d1c +Subproject commit c1c3af0ae456247c9bcd30161d51a94c9b38dc52 From d5145852139ee472f0bbd0742c629445bf6476a2 Mon Sep 17 00:00:00 2001 From: Heikki Halmet Date: Mon, 8 May 2017 09:14:22 +0300 Subject: [PATCH 07/11] Enable WinRT builds for MSVC 2017 All 2017 configurations are added to qt5.txt for now. Change-Id: I4745c61a99891e2fc6d8b381b4aa831150fb4596 Reviewed-by: Jani Heikkinen --- coin/platform_configs/qt5.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 16fe6e14..622e7509 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -3,6 +3,9 @@ Template Target OS Target arch Compiler Features qtci-windows-10-x86_64-7 WinRT_10 MSVC2015 Packaging DebugAndRelease Release DisableTests qtci-windows-10-x86-6 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests qtci-windows-10-x86_64-7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests +qtci-windows-10-x86_64-7 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-7 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-7 WinRT_10 MSVC2017 Packaging DebugAndRelease Release DisableTests qtci-linux-RHEL-7.2-x86_64 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-windows-7-x86-2 Android_ANY armv7 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-windows-7-x86-2 Android_ANY x86 Mingw53 Packaging Release DisableTests OpenGLES2 From 9b9b3817b1d660e42edb0d892a1888790ea29bb5 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Wed, 17 May 2017 21:44:52 +0300 Subject: [PATCH 08/11] Update submodules on '5.9.0' in qt5 Change-Id: Ifc375a6978c7d8fc89396b7bfbebb18f90d59b37 Reviewed-by: Jani Heikkinen --- qt3d | 2 +- qtandroidextras | 2 +- qtbase | 2 +- qtcanvas3d | 2 +- qtcharts | 2 +- qtconnectivity | 2 +- qtdatavis3d | 2 +- qtdeclarative | 2 +- qtdoc | 2 +- qtgraphicaleffects | 2 +- qtimageformats | 2 +- qtlocation | 2 +- qtmacextras | 2 +- qtmultimedia | 2 +- qtpurchasing | 2 +- qtquickcontrols | 2 +- qtquickcontrols2 | 2 +- qtremoteobjects | 2 +- qtscxml | 2 +- qtsensors | 2 +- qtserialbus | 2 +- qtserialport | 2 +- qtsvg | 2 +- qttools | 2 +- qttranslations | 2 +- qtwayland | 2 +- qtwebchannel | 2 +- qtwebengine | 2 +- qtwebsockets | 2 +- qtwebview | 2 +- 30 files changed, 30 insertions(+), 30 deletions(-) diff --git a/qt3d b/qt3d index bb0f4b48..9bf4dadd 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit bb0f4b48390b5ddc9758f04f6ecd692072fb279f +Subproject commit 9bf4daddeb62ec6a40e2d90587a7327acbb3780f diff --git a/qtandroidextras b/qtandroidextras index f0561e64..2c146304 160000 --- a/qtandroidextras +++ b/qtandroidextras @@ -1 +1 @@ -Subproject commit f0561e640a488fa1870cacaae897133c7fdf6362 +Subproject commit 2c146304f56ffe309ca5e9aa025036b7c3ec3fe3 diff --git a/qtbase b/qtbase index 464a43d4..fc874c29 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 464a43d43c2bb2440d4ad745bc134e0dac10872c +Subproject commit fc874c2976b9e066879ff22e23e6e99a65d22dfc diff --git a/qtcanvas3d b/qtcanvas3d index 6717956e..116737dc 160000 --- a/qtcanvas3d +++ b/qtcanvas3d @@ -1 +1 @@ -Subproject commit 6717956ed4b886defbb158b46b6ab572984c0891 +Subproject commit 116737dc8fa244282dda95a8f13624b66fdb5521 diff --git a/qtcharts b/qtcharts index b7ded4e4..de7f741c 160000 --- a/qtcharts +++ b/qtcharts @@ -1 +1 @@ -Subproject commit b7ded4e4216987d28be92cf8309a38c6dc18961b +Subproject commit de7f741c428febfe3c81a28f955996d2314953fc diff --git a/qtconnectivity b/qtconnectivity index ec0fb110..8dcbf68e 160000 --- a/qtconnectivity +++ b/qtconnectivity @@ -1 +1 @@ -Subproject commit ec0fb110eccb237a230fec61e02740de9c74fe1f +Subproject commit 8dcbf68e4579e03ea6d2808ac0c670169b59d0df diff --git a/qtdatavis3d b/qtdatavis3d index 1a1dc5ab..84490ff7 160000 --- a/qtdatavis3d +++ b/qtdatavis3d @@ -1 +1 @@ -Subproject commit 1a1dc5abdbc15a61e9447d9a4f0b32337a61202f +Subproject commit 84490ff75be5acdaeb3fd93900e4ebf7ba8f539b diff --git a/qtdeclarative b/qtdeclarative index c6748dde..ee6b07b3 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit c6748dde37e12339cff209d6b0e05071679d4824 +Subproject commit ee6b07b3ce8ba80632868181d45d96253acb1064 diff --git a/qtdoc b/qtdoc index aedbb438..37868497 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit aedbb438e365f8eca29f363c02e09c54c50ccbfb +Subproject commit 378684974e39e1fd7a95da20cfec970d8c860ad0 diff --git a/qtgraphicaleffects b/qtgraphicaleffects index e66fd901..db93af5b 160000 --- a/qtgraphicaleffects +++ b/qtgraphicaleffects @@ -1 +1 @@ -Subproject commit e66fd901fb9e18d45182db56ec3ce70f401d2ac4 +Subproject commit db93af5b2bb49af74fbad6c9cd80bd7010434e78 diff --git a/qtimageformats b/qtimageformats index 97f41980..71ccf0df 160000 --- a/qtimageformats +++ b/qtimageformats @@ -1 +1 @@ -Subproject commit 97f4198083ccdc61e5d8cbca8e19d5bef80936e2 +Subproject commit 71ccf0dff82835ce7b5aed74c37829afdef44cde diff --git a/qtlocation b/qtlocation index 6e276607..3f58030b 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 6e276607e507f36bd94c33652071cf0413c6ba3a +Subproject commit 3f58030b244aef6819d34b02b3a2aad926d21e05 diff --git a/qtmacextras b/qtmacextras index 3d3ca5a1..d357b7c1 160000 --- a/qtmacextras +++ b/qtmacextras @@ -1 +1 @@ -Subproject commit 3d3ca5a13c6a35883f5bfa3175a8f1ae00dfaa0d +Subproject commit d357b7c1444088959f8d3a21d3be1843cf293478 diff --git a/qtmultimedia b/qtmultimedia index 960fbf08..559c305d 160000 --- a/qtmultimedia +++ b/qtmultimedia @@ -1 +1 @@ -Subproject commit 960fbf083be4391314e8fe36994a133763dbbe7d +Subproject commit 559c305ded730e23505e8b29536a98dc59e2acfa diff --git a/qtpurchasing b/qtpurchasing index 08b5290b..f8d5b7a9 160000 --- a/qtpurchasing +++ b/qtpurchasing @@ -1 +1 @@ -Subproject commit 08b5290b67df7b9f077b85069d1e19662e8c3847 +Subproject commit f8d5b7a9355c160fb165e040c17836f43d3b38e6 diff --git a/qtquickcontrols b/qtquickcontrols index a218356f..e6208de2 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit a218356f838c4be8aad8f447e8d6187a8af639ff +Subproject commit e6208de2d0877d9025365ae7e89a6bf2caeda8fa diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 932d5f78..796fff91 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 932d5f78296e604c57c8ebcfe5c94f5ce62238f4 +Subproject commit 796fff91ac4197d41a82a453e28a1d86399ff5cf diff --git a/qtremoteobjects b/qtremoteobjects index d0b7ce30..ae0b1018 160000 --- a/qtremoteobjects +++ b/qtremoteobjects @@ -1 +1 @@ -Subproject commit d0b7ce30d3a99a751581147b647072cfbae9d321 +Subproject commit ae0b101884b05355e3a7bc06dbca722ad3d08d0f diff --git a/qtscxml b/qtscxml index 958d4d8e..eff82ac9 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit 958d4d8ecfc7afcbc9b7c0855857d2a2e1cbfa9f +Subproject commit eff82ac957e051f16f64c287f2dfaec9049bdfc1 diff --git a/qtsensors b/qtsensors index 760e6200..0c3c4d01 160000 --- a/qtsensors +++ b/qtsensors @@ -1 +1 @@ -Subproject commit 760e62003843e79d0b9d56cfb1a64d4d86992b99 +Subproject commit 0c3c4d01ea34ed98a0d2928662f07b673f00535d diff --git a/qtserialbus b/qtserialbus index f9cd9f7d..20811e3b 160000 --- a/qtserialbus +++ b/qtserialbus @@ -1 +1 @@ -Subproject commit f9cd9f7da643274e0c39fd62b8b12a6a83fc203d +Subproject commit 20811e3b004af817e3f02982c755e8b1560b8c3d diff --git a/qtserialport b/qtserialport index d88ded29..687f5a9b 160000 --- a/qtserialport +++ b/qtserialport @@ -1 +1 @@ -Subproject commit d88ded29d968b8ccf41d4dffa73c3f8f030a9f5d +Subproject commit 687f5a9bd44a45a29d24925f29470c43d6729dee diff --git a/qtsvg b/qtsvg index 0b48e082..4fd787e9 160000 --- a/qtsvg +++ b/qtsvg @@ -1 +1 @@ -Subproject commit 0b48e0821b9691ff369ad7b401cbf1f63c6397a9 +Subproject commit 4fd787e90c70afbaa168abb3efdb8757ba77f3a4 diff --git a/qttools b/qttools index 15db04e5..916e9ba2 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 15db04e57cf8bcc2ba2fa3248a2928b23f4667ab +Subproject commit 916e9ba283135b7f01b4be1d4448d3566e4941f3 diff --git a/qttranslations b/qttranslations index 03747bd6..3e727a89 160000 --- a/qttranslations +++ b/qttranslations @@ -1 +1 @@ -Subproject commit 03747bd6edba87edd148e33698b439bc2e7aac5a +Subproject commit 3e727a890f7856978469ee38ef0619b1b59a8ca7 diff --git a/qtwayland b/qtwayland index 79c4e329..f1cf62fa 160000 --- a/qtwayland +++ b/qtwayland @@ -1 +1 @@ -Subproject commit 79c4e3292bac9664bc4114e18ad28d4a468b69f5 +Subproject commit f1cf62fa8e9ffa2548c9968906848596f50dbc0b diff --git a/qtwebchannel b/qtwebchannel index 4a95a4e6..6383f0fc 160000 --- a/qtwebchannel +++ b/qtwebchannel @@ -1 +1 @@ -Subproject commit 4a95a4e603e1bfd8e365274a5888dcdbb6bb42e7 +Subproject commit 6383f0fc5eec4935697a6d2d2f87b511bbeb678e diff --git a/qtwebengine b/qtwebengine index 028bd20e..59df7bd0 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 028bd20e41fc1995c34ca4c19e5342ff3efe0c6a +Subproject commit 59df7bd0a92acf6cb9ef2eac551b7a0913e2cd1f diff --git a/qtwebsockets b/qtwebsockets index cec66b89..1421c3e4 160000 --- a/qtwebsockets +++ b/qtwebsockets @@ -1 +1 @@ -Subproject commit cec66b8969215d7355aa61655e68893f7dad5595 +Subproject commit 1421c3e4ae4213ca18f2f51d5ddb38e223450222 diff --git a/qtwebview b/qtwebview index 821e338f..6e55abf3 160000 --- a/qtwebview +++ b/qtwebview @@ -1 +1 @@ -Subproject commit 821e338f49cefb39816be29fb42c6b6c91bd94a2 +Subproject commit 6e55abf3b6a5f373cd4b649c2318a45c49b40589 From 90e14cf19492311a95993b708ef87150ebd257a4 Mon Sep 17 00:00:00 2001 From: Liang Qi Date: Fri, 19 May 2017 17:29:52 +0200 Subject: [PATCH 09/11] Update qtlocation manually Change-Id: Ief99f6b991ea0fbfc2c0d019b68835db36539587 Reviewed-by: Liang Qi --- qtlocation | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qtlocation b/qtlocation index 3f58030b..a8003c12 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit 3f58030b244aef6819d34b02b3a2aad926d21e05 +Subproject commit a8003c122e43828a5071035cd417c38a082f992f From d2430f9e6fcdc993eb2ae76364050650db58a19b Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Sat, 20 May 2017 11:30:38 +0300 Subject: [PATCH 10/11] Update submodules on '5.9.0' in qt5 Change-Id: I59a75557095d67dad5cf36f78fb86eb17cd05513 Reviewed-by: Liang Qi --- qt3d | 2 +- qtbase | 2 +- qtdeclarative | 2 +- qtlocation | 2 +- qtquickcontrols2 | 2 +- qttools | 2 +- qtwebengine | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/qt3d b/qt3d index 9bf4dadd..f39d0a0c 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 9bf4daddeb62ec6a40e2d90587a7327acbb3780f +Subproject commit f39d0a0c32cc489849a0cd5c2880f6e824223485 diff --git a/qtbase b/qtbase index fc874c29..31374105 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit fc874c2976b9e066879ff22e23e6e99a65d22dfc +Subproject commit 31374105940bb15a68683a0ae691e7fe1f9b049a diff --git a/qtdeclarative b/qtdeclarative index ee6b07b3..96f6ba5f 160000 --- a/qtdeclarative +++ b/qtdeclarative @@ -1 +1 @@ -Subproject commit ee6b07b3ce8ba80632868181d45d96253acb1064 +Subproject commit 96f6ba5f562073f508cd8569ac354592fdd48f4a diff --git a/qtlocation b/qtlocation index a8003c12..888d351c 160000 --- a/qtlocation +++ b/qtlocation @@ -1 +1 @@ -Subproject commit a8003c122e43828a5071035cd417c38a082f992f +Subproject commit 888d351cb0c7fe6d05ab1efe8d4dbb4b6f06cd5f diff --git a/qtquickcontrols2 b/qtquickcontrols2 index 796fff91..ef6b8d30 160000 --- a/qtquickcontrols2 +++ b/qtquickcontrols2 @@ -1 +1 @@ -Subproject commit 796fff91ac4197d41a82a453e28a1d86399ff5cf +Subproject commit ef6b8d3081f0bf93d6d59e67c8e3f82c63c511c3 diff --git a/qttools b/qttools index 916e9ba2..0008da17 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 916e9ba283135b7f01b4be1d4448d3566e4941f3 +Subproject commit 0008da1767759592b372d355d6b1ee54a0e82036 diff --git a/qtwebengine b/qtwebengine index 59df7bd0..73f7be5b 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 59df7bd0a92acf6cb9ef2eac551b7a0913e2cd1f +Subproject commit 73f7be5b2a95eab3dce11caede538eeb7beb71f2 From 4d6b04db3c1711e5f60b3d2421ed27eb5ffcb85f Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Mon, 22 May 2017 16:28:37 +0200 Subject: [PATCH 11/11] Update submodules on '5.9.0' in qt5 Change-Id: I4b682b41b9d42a95c9d7837a0c9d2a5cd1b16d0a Reviewed-by: Simon Hausmann --- qtdoc | 2 +- qtquickcontrols | 2 +- qttools | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/qtdoc b/qtdoc index 37868497..c5028bda 160000 --- a/qtdoc +++ b/qtdoc @@ -1 +1 @@ -Subproject commit 378684974e39e1fd7a95da20cfec970d8c860ad0 +Subproject commit c5028bdacabf02c2d2e06872e6fdbfa8f86f8401 diff --git a/qtquickcontrols b/qtquickcontrols index e6208de2..dacb9191 160000 --- a/qtquickcontrols +++ b/qtquickcontrols @@ -1 +1 @@ -Subproject commit e6208de2d0877d9025365ae7e89a6bf2caeda8fa +Subproject commit dacb91916b202208681471ba764504c7c7d086f0 diff --git a/qttools b/qttools index 0008da17..88e02bb0 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 0008da1767759592b372d355d6b1ee54a0e82036 +Subproject commit 88e02bb0a9b97d68a4b270e4ddfb6d0847c702a9