From c0b7daeb106b564d053e9bd5d62e5f1ac26f6d9d Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Thu, 25 Jan 2018 01:01:42 +0200 Subject: Update submodules on 'dev' in qt5 Change-Id: I3b1e1f1b46d3cb067e335ce1bef0da3046afed8e Reviewed-by: Qt Submodule Update Bot --- qt3d | 2 +- qtbase | 2 +- qtopcua | 2 +- qtscxml | 2 +- qtwebengine | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/qt3d b/qt3d index 598acd70..f6a9174e 160000 --- a/qt3d +++ b/qt3d @@ -1 +1 @@ -Subproject commit 598acd70a44f787a3e72c586576bfc028d5af02d +Subproject commit f6a9174e5efeda68151f2d992fcd916fb2dd2c99 diff --git a/qtbase b/qtbase index efec288f..43c44d05 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit efec288f58dc18f6a571bfedf9d19e3fbf12a18f +Subproject commit 43c44d05ca6af4ec78c1dea84635375a637ff80d diff --git a/qtopcua b/qtopcua index 74a6a384..b53d543b 160000 --- a/qtopcua +++ b/qtopcua @@ -1 +1 @@ -Subproject commit 74a6a38411c37a670e70c3292eab2b9071d7719f +Subproject commit b53d543b0fc3f7e4ae2daab0e04326571f8054a6 diff --git a/qtscxml b/qtscxml index ac1bc572..38d0c7d9 160000 --- a/qtscxml +++ b/qtscxml @@ -1 +1 @@ -Subproject commit ac1bc572a22ed3de61076e2b8f27dea52171ddc8 +Subproject commit 38d0c7d930ce986e1406ce24894de4e4bced5387 diff --git a/qtwebengine b/qtwebengine index 2daa4950..5ab15758 160000 --- a/qtwebengine +++ b/qtwebengine @@ -1 +1 @@ -Subproject commit 2daa4950118dd76d0d0bf15e347217740b0cb5c5 +Subproject commit 5ab157588214bfbbc1d1f258a461b1cab4cc3991 -- cgit v1.2.3 From 18b5dbf7df629e3b92152d53d8db8dd8e7d8ba7f Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen Date: Thu, 25 Jan 2018 11:44:02 +0100 Subject: Add a MSVC2017 platform to the default tested Is needed for qtwebkit and qtwebengine testing and added in dev, where MSVC2013 was removed to not add additional pressure on the CI. Task-number: QTBUG-65830 Change-Id: I48d3a36a9f69f7345d3cf4dc5a652adb62bb461f Reviewed-by: Simon Hausmann Reviewed-by: Frederik Gladhorn --- coin/platform_configs/default.txt | 1 + coin/platform_configs/qt5.txt | 1 - coin/platform_configs/qtwebkit.txt | 1 - 3 files changed, 1 insertion(+), 2 deletions(-) diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 31a71e98..66193fbc 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -6,6 +6,7 @@ qtci-windows-10-x86_64-10 x86 MSVC2015 qtci-windows-10-x86_64-10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests +qtci-windows-10-x86_64-10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic qtci-linux-Ubuntu-16.04-x86_64-2 GCC NoWidgets ForceDebugInfo qtci-linux-Ubuntu-16.04-x86_64-2 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples Documentation qtci-linux-openSUSE-42.3-x86_64 GCC DeveloperBuild NoPch diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 0789b1fb..36d8f5eb 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -2,7 +2,6 @@ Template Target OS Target arch Compiler Features --------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- qtci-windows-10-x86_64-10 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-10-x86-6 MSVC2017 DebugAndRelease Release ForceDebugInfo OpenGLDynamic -qtci-windows-10-x86_64-10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-7-x86-3 Mingw53 Packaging DebugAndRelease Release OpenGLDynamic DisableTests qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests diff --git a/coin/platform_configs/qtwebkit.txt b/coin/platform_configs/qtwebkit.txt index 75fa9c20..efae9754 100644 --- a/coin/platform_configs/qtwebkit.txt +++ b/coin/platform_configs/qtwebkit.txt @@ -1,5 +1,4 @@ Template Target OS Target arch Compiler Features --------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- qtci-windows-10-x86_64-10 x86 MSVC2017 DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests -qtci-windows-10-x86_64-10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests qtci-windows-7-x86-3 Mingw53 Packaging DebugAndRelease Release OpenGLDynamic DisableTests -- cgit v1.2.3 From b032d8763264b801da7f42d875cdf0a224e54c23 Mon Sep 17 00:00:00 2001 From: Frederik Gladhorn Date: Mon, 29 Jan 2018 17:56:54 +0100 Subject: Revert "Adjust submodule branches" This got merged accidentally. This reverts commit 282899453d2c6b4c51bbd94fc228f2bb711d64f6. Change-Id: I1457513217e636aa54b43a1dc21b01443c798119 Reviewed-by: Frederik Gladhorn --- .gitmodules | 82 ++++++++++++++++++++++++++++++------------------------------- 1 file changed, 41 insertions(+), 41 deletions(-) diff --git a/.gitmodules b/.gitmodules index d68fd180..1fc98730 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,66 +1,66 @@ [submodule "qtbase"] path = qtbase url = ../qtbase.git - branch = 5.11 + branch = dev status = essential [submodule "qtsvg"] depends = qtbase path = qtsvg url = ../qtsvg.git - branch = 5.11 + branch = dev status = addon [submodule "qtdeclarative"] depends = qtbase recommends = qtsvg qtxmlpatterns path = qtdeclarative url = ../qtdeclarative.git - branch = 5.11 + branch = dev status = essential [submodule "qtactiveqt"] depends = qtbase path = qtactiveqt url = ../qtactiveqt.git - branch = 5.11 + branch = dev status = addon [submodule "qtscript"] depends = qtbase recommends = qttools path = qtscript url = ../qtscript.git - branch = 5.11 + branch = dev status = deprecated [submodule "qtmultimedia"] depends = qtbase recommends = qtdeclarative path = qtmultimedia url = ../qtmultimedia.git - branch = 5.11 + branch = dev status = essential [submodule "qttools"] depends = qtbase recommends = qtdeclarative qtactiveqt path = qttools url = ../qttools.git - branch = 5.11 + branch = dev status = essential [submodule "qtxmlpatterns"] depends = qtbase path = qtxmlpatterns url = ../qtxmlpatterns.git - branch = 5.11 + branch = dev status = addon [submodule "qttranslations"] depends = qttools path = qttranslations url = ../qttranslations.git - branch = 5.11 + branch = dev status = essential priority = 30 [submodule "qtdoc"] depends = qtdeclarative path = qtdoc url = ../qtdoc.git - branch = 5.11 + branch = dev status = essential priority = 40 [submodule "qtrepotools"] @@ -81,14 +81,14 @@ recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport path = qtlocation url = ../qtlocation.git - branch = 5.11 + branch = dev status = addon [submodule "qtsensors"] depends = qtbase recommends = qtdeclarative path = qtsensors url = ../qtsensors.git - branch = 5.11 + branch = dev status = addon [submodule "qtsystems"] depends = qtbase @@ -121,27 +121,27 @@ recommends = qtdeclarative qtandroidextras path = qtconnectivity url = ../qtconnectivity.git - branch = 5.11 + branch = dev status = addon [submodule "qtwayland"] depends = qtbase recommends = qtdeclarative path = qtwayland url = ../qtwayland.git - branch = 5.11 + branch = dev status = addon [submodule "qt3d"] depends = qtbase recommends = qtdeclarative qtimageformats qtgamepad path = qt3d url = ../qt3d.git - branch = 5.11 + branch = dev status = addon [submodule "qtimageformats"] depends = qtbase path = qtimageformats url = ../qtimageformats.git - branch = 5.11 + branch = dev status = addon [submodule "qtquick1"] depends = qtscript @@ -154,51 +154,51 @@ depends = qtdeclarative path = qtgraphicaleffects url = ../qtgraphicaleffects.git - branch = 5.11 + branch = dev status = addon [submodule "qtquickcontrols"] depends = qtdeclarative recommends = qtgraphicaleffects path = qtquickcontrols url = ../qtquickcontrols.git - branch = 5.11 + branch = dev status = essential [submodule "qtserialbus"] depends = qtserialport path = qtserialbus url = ../qtserialbus.git - branch = 5.11 + branch = dev status = addon [submodule "qtserialport"] depends = qtbase path = qtserialport url = ../qtserialport.git - branch = 5.11 + branch = dev status = addon [submodule "qtx11extras"] depends = qtbase path = qtx11extras url = ../qtx11extras.git - branch = 5.11 + branch = dev status = addon [submodule "qtmacextras"] depends = qtbase path = qtmacextras url = ../qtmacextras.git - branch = 5.11 + branch = dev status = addon [submodule "qtwinextras"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtwinextras url = ../qtwinextras.git - branch = 5.11 + branch = dev status = addon [submodule "qtandroidextras"] depends = qtbase path = qtandroidextras url = ../qtandroidextras.git - branch = 5.11 + branch = dev status = addon [submodule "qtenginio"] depends = qtdeclarative @@ -211,114 +211,114 @@ recommends = qtdeclarative path = qtwebsockets url = ../qtwebsockets.git - branch = 5.11 + branch = dev status = addon [submodule "qtwebchannel"] depends = qtbase recommends = qtdeclarative qtwebsockets path = qtwebchannel url = ../qtwebchannel.git - branch = 5.11 + branch = dev status = addon [submodule "qtwebengine"] depends = qtquickcontrols qtwebchannel recommends = qtlocation qttools path = qtwebengine url = ../qtwebengine.git - branch = 5.11 + branch = dev status = addon priority = 10 [submodule "qtcanvas3d"] depends = qtdeclarative path = qtcanvas3d url = ../qtcanvas3d.git - branch = 5.11 + branch = dev status = addon [submodule "qtwebview"] depends = qtdeclarative recommends = qtwebengine path = qtwebview url = ../qtwebview.git - branch = 5.11 + branch = dev status = addon [submodule "qtquickcontrols2"] depends = qtgraphicaleffects recommends = qtimageformats path = qtquickcontrols2 url = ../qtquickcontrols2.git - branch = 5.11 + branch = dev status = addon [submodule "qtpurchasing"] depends = qtbase qtandroidextras recommends = qtdeclarative path = qtpurchasing url = ../qtpurchasing.git - branch = 5.11 + branch = dev status = addon [submodule "qtcharts"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtcharts url = ../qtcharts.git - branch = 5.11 + branch = dev status = addon [submodule "qtdatavis3d"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtdatavis3d url = ../qtdatavis3d.git - branch = 5.11 + branch = dev status = addon [submodule "qtvirtualkeyboard"] depends = qtbase qtdeclarative qtsvg recommends = qtmultimedia qtquickcontrols path = qtvirtualkeyboard url = ../qtvirtualkeyboard.git - branch = 5.11 + branch = dev status = addon [submodule "qtgamepad"] depends = qtbase recommends = qtdeclarative path = qtgamepad url = ../qtgamepad.git - branch = 5.11 + branch = dev status = addon [submodule "qtscxml"] depends = qtbase qtdeclarative path = qtscxml url = ../qtscxml.git - branch = 5.11 + branch = dev status = addon [submodule "qtspeech"] depends = qtbase recommends = qtdeclarative qtmultimedia path = qtspeech url = ../qtspeech.git - branch = 5.11 + branch = dev status = addon [submodule "qtnetworkauth"] depends = qtbase path = qtnetworkauth url = ../qtnetworkauth.git - branch = 5.11 + branch = dev status = addon [submodule "qtremoteobjects"] depends = qtbase recommends = qtdeclarative path = qtremoteobjects url = ../qtremoteobjects.git - branch = 5.11 + branch = dev status = preview [submodule "qtwebglplugin"] depends = qtbase qtwebsockets recommends = qtdeclarative path = qtwebglplugin url = ../qtwebglplugin.git - branch = 5.11 + branch = dev status = preview [submodule "qtopcua"] depends = qtbase path = qtopcua url = ../qtopcua.git - branch = 5.11 + branch = dev status = preview -- cgit v1.2.3 From 13be05c06d8a14e2982f0b6d6aadcadb935d27b5 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Tue, 23 Jan 2018 12:50:19 +0100 Subject: Swap qtquickcontrols vs. qtquickcontrols2 statuses The Qt Quick Controls (1) module, which was still listed as an essential module, has not been actively developed for almost three years. Promote Qt Quick Controls 2 as an essential module instead, and demote Qt Quick Controls (1) as an addon. Change-Id: If51c6c17d199ca10a574053d7dba67539a764aba Reviewed-by: Frederik Gladhorn --- .gitmodules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitmodules b/.gitmodules index 1fc98730..64a36638 100644 --- a/.gitmodules +++ b/.gitmodules @@ -162,7 +162,7 @@ path = qtquickcontrols url = ../qtquickcontrols.git branch = dev - status = essential + status = addon [submodule "qtserialbus"] depends = qtserialport path = qtserialbus @@ -247,7 +247,7 @@ path = qtquickcontrols2 url = ../qtquickcontrols2.git branch = dev - status = addon + status = essential [submodule "qtpurchasing"] depends = qtbase qtandroidextras recommends = qtdeclarative -- cgit v1.2.3 From 704b2387de408f4d869baf4f72cedc80999af842 Mon Sep 17 00:00:00 2001 From: Qt Submodule Update Bot Date: Tue, 30 Jan 2018 01:01:15 +0200 Subject: Update submodules on 'dev' in qt5 Change-Id: Ie2e621ae2c2387c7daa0c29c5e04c8928fed169b Reviewed-by: Qt Submodule Update Bot Reviewed-by: Frederik Gladhorn --- qtbase | 2 +- qttools | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/qtbase b/qtbase index 43c44d05..e4fc098a 160000 --- a/qtbase +++ b/qtbase @@ -1 +1 @@ -Subproject commit 43c44d05ca6af4ec78c1dea84635375a637ff80d +Subproject commit e4fc098a53de86a8a9986d7e998d0bd56fecf93b diff --git a/qttools b/qttools index 135482d3..a419399c 160000 --- a/qttools +++ b/qttools @@ -1 +1 @@ -Subproject commit 135482d36409b5763292c1bf92a8bae7b8322bbe +Subproject commit a419399cbf631b78768eb159775004ddc4e46370 -- cgit v1.2.3