Update submodules on 'wip/qt6' in qt5

Only qtmultimedia and qtwebengine in this round. Change-Id: I82a7b1db76aa0074cd42eeaea96e4e0e4539a564 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Merge "Merge remote-tracking branch 'origin/dev' into wip/qt6"
2026-01-18 21:06:43 +08:00 · 2019-09-13 14:05:59 +02:00 · 2019-09-13 14:05:49 +02:00 · 2019-09-13 14:04:47 +02:00 · 2019-09-07 09:04:49 +02:00 · 2019-08-14 13:08:44 +02:00
47 changed files with 86 additions and 147 deletions
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,60 +1,60 @@
 [submodule "qtbase"]
 	path = qtbase
 	url = ../qtbase.git
-	branch = dev
+	branch = wip/qt6
 	status = essential
 [submodule "qtsvg"]
 	depends = qtbase
 	path = qtsvg
 	url = ../qtsvg.git
-	branch = dev
+	branch = wip/qt6
 	status = addon
 [submodule "qtdeclarative"]
 	depends = qtbase
 	recommends = qtsvg
 	path = qtdeclarative
 	url = ../qtdeclarative.git
-	branch = dev
+	branch = wip/qt6
 	status = essential
 [submodule "qtactiveqt"]
 	depends = qtbase
 	path = qtactiveqt
 	url = ../qtactiveqt.git
-	branch = dev
+	branch = wip/qt6
 	status = addon
 [submodule "qtscript"]
 	depends = qtbase
 	recommends = qttools
 	path = qtscript
 	url = ../qtscript.git
-	branch = dev
+	branch = wip/qt6
 	status = deprecated
 [submodule "qtmultimedia"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtmultimedia
 	url = ../qtmultimedia.git
-	branch = dev
+	branch = wip/qt6
 	status = essential
 [submodule "qttools"]
 	depends = qtbase
 	recommends = qtdeclarative qtactiveqt
 	path = qttools
 	url = ../qttools.git
-	branch = dev
+	branch = wip/qt6
 	status = essential
 [submodule "qtxmlpatterns"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtxmlpatterns
 	url = ../qtxmlpatterns.git
-	branch = dev
+	branch = wip/qt6
 	status = deprecated
 [submodule "qttranslations"]
 	depends = qttools
 	path = qttranslations
 	url = ../qttranslations.git
-	branch = dev
+	branch = wip/qt6
 	status = essential
 	priority = 30
 [submodule "qtdoc"]
@@ -62,7 +62,7 @@
 	recommends = qtmultimedia qtquickcontrols qtquickcontrols2
 	path = qtdoc
 	url = ../qtdoc.git
-	branch = dev
+	branch = wip/qt6
 	status = essential
 	priority = 40
 [submodule "qtrepotools"]
@@ -83,14 +83,14 @@
 	recommends = qtdeclarative qtquickcontrols qtquickcontrols2 qtserialport
 	path = qtlocation
 	url = ../qtlocation.git
-	branch = dev
+	branch = wip/qt6
 	status = addon
 [submodule "qtsensors"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtsensors
 	url = ../qtsensors.git
-	branch = dev
+	branch = wip/qt6
 	status = addon
 [submodule "qtsystems"]
 	depends = qtbase
@@ -123,99 +123,99 @@
 	recommends = qtdeclarative qtandroidextras
 	path = qtconnectivity
 	url = ../qtconnectivity.git
-	branch = dev
+	branch = wip/qt6
 	status = addon
 [submodule "qtwayland"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwayland
 	url = ../qtwayland.git
-	branch = dev
+	branch = wip/qt6
 	status = addon
 [submodule "qt3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtimageformats qtgamepad
 	path = qt3d
 	url = ../qt3d.git
-	branch = dev
+	branch = wip/qt6
 	status = addon
 [submodule "qtimageformats"]
 	depends = qtbase
 	path = qtimageformats
 	url = ../qtimageformats.git
-	branch = dev
+	branch = wip/qt6
 	status = addon
 [submodule "qtgraphicaleffects"]
 	depends = qtdeclarative
 	path = qtgraphicaleffects
 	url = ../qtgraphicaleffects.git
-	branch = dev
+	branch = wip/qt6
 	status = addon
 [submodule "qtquickcontrols"]
 	depends = qtdeclarative
 	recommends = qtgraphicaleffects
 	path = qtquickcontrols
 	url = ../qtquickcontrols.git
-	branch = dev
+	branch = wip/qt6
 	status = addon
 [submodule "qtserialbus"]
 	depends = qtbase
 	recommends = qtserialport
 	path = qtserialbus
 	url = ../qtserialbus.git
-	branch = dev
+	branch = wip/qt6
 	status = addon
 [submodule "qtserialport"]
 	depends = qtbase
 	path = qtserialport
 	url = ../qtserialport.git
-	branch = dev
+	branch = wip/qt6
 	status = addon
 [submodule "qtx11extras"]
 	depends = qtbase
 	path = qtx11extras
 	url = ../qtx11extras.git
-	branch = dev
+	branch = wip/qt6
 	status = addon
 [submodule "qtmacextras"]
 	depends = qtbase
 	path = qtmacextras
 	url = ../qtmacextras.git
-	branch = dev
+	branch = wip/qt6
 	status = addon
 [submodule "qtwinextras"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtwinextras
 	url = ../qtwinextras.git
-	branch = dev
+	branch = wip/qt6
 	status = addon
 [submodule "qtandroidextras"]
 	depends = qtbase
 	path = qtandroidextras
 	url = ../qtandroidextras.git
-	branch = dev
+	branch = wip/qt6
 	status = addon
 [submodule "qtwebsockets"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtwebsockets
 	url = ../qtwebsockets.git
-	branch = dev
+	branch = wip/qt6
 	status = addon
 [submodule "qtwebchannel"]
 	depends = qtbase
 	recommends = qtdeclarative qtwebsockets
 	path = qtwebchannel
 	url = ../qtwebchannel.git
-	branch = dev
+	branch = wip/qt6
 	status = addon
 [submodule "qtwebengine"]
 	depends = qtdeclarative
 	recommends = qtquickcontrols qtquickcontrols2 qtlocation qtwebchannel qttools
 	path = qtwebengine
 	url = ../qtwebengine.git
-	branch = dev
+	branch = wip/qt6
 	status = addon
 	priority = 10
 [submodule "qtcanvas3d"]
@@ -229,98 +229,98 @@
 	recommends = qtwebengine
 	path = qtwebview
 	url = ../qtwebview.git
-	branch = dev
+	branch = wip/qt6
 	status = addon
 [submodule "qtquickcontrols2"]
 	depends = qtgraphicaleffects
 	recommends = qtimageformats
 	path = qtquickcontrols2
 	url = ../qtquickcontrols2.git
-	branch = dev
+	branch = wip/qt6
 	status = essential
 [submodule "qtpurchasing"]
 	depends = qtbase
 	recommends = qtdeclarative qtandroidextras
 	path = qtpurchasing
 	url = ../qtpurchasing.git
-	branch = dev
+	branch = wip/qt6
 	status = addon
 [submodule "qtcharts"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtcharts
 	url = ../qtcharts.git
-	branch = dev
+	branch = wip/qt6
 	status = addon
 [submodule "qtdatavis3d"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtdatavis3d
 	url = ../qtdatavis3d.git
-	branch = dev
+	branch = wip/qt6
 	status = addon
 [submodule "qtvirtualkeyboard"]
 	depends = qtbase qtdeclarative qtsvg
 	recommends = qtmultimedia qtquickcontrols
 	path = qtvirtualkeyboard
 	url = ../qtvirtualkeyboard.git
-	branch = dev
+	branch = wip/qt6
 	status = addon
 [submodule "qtgamepad"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtgamepad
 	url = ../qtgamepad.git
-	branch = dev
+	branch = wip/qt6
 	status = addon
 [submodule "qtscxml"]
 	depends = qtbase qtdeclarative
 	path = qtscxml
 	url = ../qtscxml.git
-	branch = dev
+	branch = wip/qt6
 	status = addon
 [submodule "qtspeech"]
 	depends = qtbase
 	recommends = qtdeclarative qtmultimedia
 	path = qtspeech
 	url = ../qtspeech.git
-	branch = dev
+	branch = wip/qt6
 	status = addon
 [submodule "qtnetworkauth"]
 	depends = qtbase
 	path = qtnetworkauth
 	url = ../qtnetworkauth.git
-	branch = dev
+	branch = wip/qt6
 	status = addon
 [submodule "qtremoteobjects"]
 	depends = qtbase
 	recommends = qtdeclarative
 	path = qtremoteobjects
 	url = ../qtremoteobjects.git
-	branch = dev
+	branch = wip/qt6
 	status = addon
 [submodule "qtwebglplugin"]
 	depends = qtbase qtwebsockets
 	recommends = qtdeclarative
 	path = qtwebglplugin
 	url = ../qtwebglplugin.git
-	branch = dev
+	branch = wip/qt6
 	status = addon
 [submodule "qtlottie"]
 	depends = qtbase qtdeclarative
 	path = qtlottie
 	url = ../qtlottie.git
-	branch = dev
+	branch = wip/qt6
 	status = preview
 [submodule "qtquicktimeline"]
 	depends = qtbase qtdeclarative
 	path = qtquicktimeline
 	url = ../qtquicktimeline
-	branch = dev
+	branch = wip/qt6
 	status = preview
 [submodule "qtquick3d"]
 	depends = qtbase qtdeclarative
 	path = qtquick3d
 	url = ../qtquick3d.git
 	branch = dev
-	status = preview
+	status = ignore
--- a/coin/platform_configs/default.yaml
+++ b/coin/platform_configs/default.yaml
@@ -1,46 +1,12 @@
-
-    Template: 'qtci-windows-10-x86_64-14'
-    Compiler: 'MSVC2015'
-    Features: ['DisableTests']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -angle -qtnamespace TestNamespace -qtlibinfix TestInfix -nomake tests -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% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64%'
 -
    Template: 'qtci-windows-7-x86-3'
    Compiler: 'Mingw73'
    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -developer-build -release -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -plugin-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86% -platform win32-g++'
-
-    Template: 'qtci-windows-10-x86_64-14'
-    Target arch: 'x86'
-    Compiler: 'MSVC2017'
-    Features: ['Packaging']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x86% -L %OPENSSL_LIB_x86% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x86% -L %MYSQL_LIB_x86% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x86% -L %POSTGRESQL_LIB_x86%'
-
-    Template: 'qtci-windows-10-x86_64-14'
-    Compiler: 'MSVC2015'
-    Features: ['Packaging', 'DisableTests']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -opengl dynamic -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64%'
-
-    Template: 'qtci-windows-10-x86_64-14'
-    Target os: 'WinRT_10'
-    Target arch: 'x86'
-    Compiler: 'MSVC2015'
-    Features: ['DisableTests']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-x86-msvc2015'
-
-    Template: 'qtci-windows-10-x86_64-14'
-    Target os: 'WinRT_10'
-    Target arch: 'armv7'
-    Compiler: 'MSVC2015'
-    Features: ['Packaging', 'DisableTests']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -nomake examples -no-sql-mysql -platform win32-msvc2015 -xplatform winrt-arm-msvc2015'
 -
    Template: 'qtci-windows-10-x86_64-14'
    Compiler: 'MSVC2017'
    Features: ['Packaging']
    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -debug-and-release -release -force-debug-info -nomake tests -opengl dynamic -nomake examples -openssl -I %OPENSSL_INCLUDE_x64% -L %OPENSSL_LIB_x64% -no-sql-mysql -plugin-sql-sqlite -plugin-sql-odbc -I %MYSQL_INCLUDE_x64% -L %MYSQL_LIB_x64% -plugin-sql-psql -I %POSTGRESQL_INCLUDE_x64% -L %POSTGRESQL_LIB_x64%'
-
-    Template: 'qtci-linux-Ubuntu-18.04-x86_64'
-    Compiler: 'GCC'
-    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'
@@ -50,11 +16,6 @@
    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-openSUSE-15.0-x86_64'
-    Compiler: 'GCC'
-    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -developer-build -nomake tests -nomake examples -no-pch -R . -openssl -I {{.Env.OPENSSL_HOME}}/include -L {{.Env.OPENSSL_HOME}}/lib'
 -
    Template: 'qtci-linux-openSUSE-15.0-x86_64'
    Compiler: 'ICC_18'
@@ -76,15 +37,6 @@
    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'
-
-    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'
-
-    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'
 -
    Template: 'qtci-macos-10.13-x86_64-2'
    Target os: 'IOS_ANY'
@@ -138,13 +90,6 @@
    Template: 'qtci-linux-Ubuntu-18.04-x86_64'
    Compiler: 'GCC'
    Features: ['TestOnly', 'LicenseCheck']
-
-    Template: 'qtci-linux-RHEL-7.6-x86_64'
-    Target os: 'INTEGRITY_11_04'
-    Target arch: 'armv7'
-    Compiler: 'GCC'
-    Features: ['DisableTests']
-    Configure arguments: '-opensource -confirm-license -verbose -prefix /home/qt/work/install -release -nomake tests -nomake examples -no-use-gold-linker -opengl es2 -xplatform integrity-armv7-imx6'
 -
    Template: 'qtci-linux-RHEL-7.6-x86_64'
    Target os: 'QNX_700'
--- a/coin/platform_configs/qtbase.yaml
+++ b/coin/platform_configs/qtbase.yaml
@@ -12,12 +12,6 @@
    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-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-windows-10-x86_64-14'
-    Target os: 'WinRT_10'
-    Target arch: 'x86_64'
-    Compiler: 'MSVC2015'
-    Configure arguments: '-opensource -confirm-license -verbose -prefix c:\Users\qt\work\install -release -developer-build -static -nomake tests -nomake examples -no-icu -force-debug-info -platform win32-msvc2015 -xplatform winrt-x64-msvc2015'
 -
    Template: 'qtci-linux-openSUSE-15.0-x86_64'
    Target os: 'WebAssembly'
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
--- a/2
+++ b/2
Author	SHA1	Message	Date
Liang Qi	b2febbfbc7	Update submodules on 'wip/qt6' in qt5 Only qtmultimedia and qtwebengine in this round. Change-Id: I82a7b1db76aa0074cd42eeaea96e4e0e4539a564 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>	2019-09-13 14:05:59 +02:00
Liang Qi	a2151b9c7f	Merge "Merge remote-tracking branch 'origin/dev' into wip/qt6"	2019-09-13 14:05:49 +02:00
Liang Qi	14d2852597	Merge remote-tracking branch 'origin/dev' into wip/qt6 Conflicts: .gitmodules Ignore qtquick3d for now. coin/platform_configs/default.txt coin/platform_configs/default.yaml coin/platform_configs/qtbase.txt coin/platform_configs/qtbase.yaml We use yaml files for configurations now. Adjust the configurations for Qt6 as it was done before in the .txt files. Done-With: Alexandru Croitor <alexandru.croitor@qt.io> Change-Id: Ica164f8865aed011c550ba7e1e8137e2bf9fdda9	2019-09-13 14:04:47 +02:00
Liang Qi	1eae3c4185	Update submodules on 'dev' in qt5 Change-Id: I87be62d19a3aee1fae16cdf27fd35ec67e30130d Reviewed-by: Liang Qi <liang.qi@qt.io>	2019-09-07 09:04:49 +02:00
Alexandru Croitor	8c2ecdbc27	Update qt5 wip/qt6 Bump qtwebengine sha1 and re-enable qtwebengine and qtwebview to be built. Change-Id: I5f9f57b1083629e4294b4a34b74780a862d9e873 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>	2019-08-14 13:08:44 +02:00
Alexandru Croitor	621c18b60b	Update qt5 wip/qt6 Point qt3d, qtdeclarative, qtgraphicaleffects, qtimageformats, qtnetworkauth, qtquickcontrols2, qtsvg to latest wip/qt6. Also re-enable the qt3d build. Change-Id: If9d122e064021b500a423376b991edbb5c1903fc Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Alexandru Croitor <alexandru.croitor@qt.io>	2019-08-11 13:42:14 +02:00
Alexandru Croitor	f46f85b0c7	Update qt5 wip/qt6 Point qtbase to latest wip/qt6. Temporarily disable building qt3d because it fails with the new qtbase version, but updating it with old SHA1 of qtbase is also not possible. Change-Id: I232920be48f01608f196c24370c684eccbd3994f Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>	2019-08-10 00:17:47 +02:00
Alexandru Croitor	3e396d5ef1	Update qt5 wip/qt6 Point qtbase to wip/qt6. And use new sha1s for other repositories when needed. And update .gitmodules branch to point to wip/qt6. Change-Id: Ic12a106d1b491f77277419a27b61396ba07f1737 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>	2019-08-09 15:59:54 +02:00
Alexandru Croitor	0b2f4d57e4	Update qt5 wip/qt6 qtbase pointing to dev branch, and other repos pointing to wip/qt6. qtwebengine and qtwebview are not built at the moment. The build of the mentioned repos will be restored after bumping qtbase version to 6.0.0, and after the subsequent qt/qt5 wip/qt6 integration is merged. Change-Id: I9b6b8136b2f58b181ae2d2dadb8a96b9c1103225 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>	2019-07-29 15:24:06 +00:00
Alexandru Croitor	9f1feaf3a0	Merge remote-tracking branch 'origin/dev' into wip/qt6 Fixes the qtdeclarative quoting around DISTRO_OPTS. Brings in qtquicktimeline submodule. Change-Id: I7a6a5ae92a196389aff612b7b0dd98a2d31ff4d0	2019-07-07 13:41:22 +02:00
Alexandru Croitor	84e57b1fb0	Try to update sha1s of submodules to get a working qt5 wip/qt6 branch qtbase, qtremoteobjects, qtquickcontrols, qtquickcontrols2 qtlocation and qttools are updated to latest dev HEAD. qtimageformats, qtnetworkauth, qtsvg, qtdeclarative are updated to point to latest wip/qt6 HEAD. Change-Id: I70938d0d258208670c7d3e3f73fe3e3b274c2eb2 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>	2019-07-06 20:33:23 +00:00
Frederik Gladhorn	5677a43a25	Remove platforms from Qt 6 Get to a smaller set to reduce load on the CI and have faster turnaround times while developing. Remove some older compilers that do not support the minimum C++ feature set we want to require for Qt 6. We'll need to revisit and probably expand this set when we get closer to releasing Qt 6. Change-Id: I6afba8b3caca0fac5bbf80efdcde7714b8d1ab76 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>	2019-05-16 08:33:58 +00:00