mirror of
git://code.qt.io/qt/qt5.git
synced 2026-02-01 19:36:04 +08:00
Update submodules and disable some failing repositories
Until dev is fixed, we disable some of the broken repos in the qt5 wip/cmake branch: qttools, qtremoteobjects, qtscxml, qtwebsockets, qtwinextras. Also switch Windows to be built in Release mode, to circumvent some issues with Debug builds that are also present in dev. Note qmake builds in Coin also only build Release builds of Windows for testing. Change-Id: Ie095fa16920fb6bd92db80118abeb6b282c96897 Reviewed-by: Qt CMake Build Bot Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
committed by
Alexandru Croitor
parent
872c905004
commit
31d83f1ddb
14
.gitmodules
vendored
14
.gitmodules
vendored
@@ -1,7 +1,7 @@
|
||||
[submodule "qtbase"]
|
||||
path = qtbase
|
||||
url = ../qtbase.git
|
||||
branch = wip/cmake
|
||||
branch = refs/changes/71/283671/6
|
||||
status = essential
|
||||
[submodule "qtsvg"]
|
||||
depends = qtbase
|
||||
@@ -14,7 +14,7 @@
|
||||
recommends = qtsvg
|
||||
path = qtdeclarative
|
||||
url = ../qtdeclarative.git
|
||||
branch = wip/cmake
|
||||
branch = refs/changes/15/287315/8
|
||||
status = essential
|
||||
[submodule "qtactiveqt"]
|
||||
depends = qtbase
|
||||
@@ -42,7 +42,7 @@
|
||||
path = qttools
|
||||
url = ../qttools.git
|
||||
branch = wip/cmake
|
||||
status = essential
|
||||
status = ignore
|
||||
[submodule "qtxmlpatterns"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative
|
||||
@@ -189,7 +189,7 @@
|
||||
path = qtwinextras
|
||||
url = ../qtwinextras.git
|
||||
branch = wip/cmake
|
||||
status = addon
|
||||
status = ignore
|
||||
[submodule "qtandroidextras"]
|
||||
depends = qtbase
|
||||
path = qtandroidextras
|
||||
@@ -202,7 +202,7 @@
|
||||
path = qtwebsockets
|
||||
url = ../qtwebsockets.git
|
||||
branch = wip/cmake
|
||||
status = addon
|
||||
status = ignore
|
||||
[submodule "qtwebchannel"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtwebsockets
|
||||
@@ -278,7 +278,7 @@
|
||||
path = qtscxml
|
||||
url = ../qtscxml.git
|
||||
branch = wip/cmake
|
||||
status = addon
|
||||
status = ignore
|
||||
[submodule "qtspeech"]
|
||||
depends = qtbase
|
||||
recommends = qtdeclarative qtmultimedia
|
||||
@@ -298,7 +298,7 @@
|
||||
path = qtremoteobjects
|
||||
url = ../qtremoteobjects.git
|
||||
branch = wip/cmake
|
||||
status = addon
|
||||
status = ignore
|
||||
[submodule "qtwebglplugin"]
|
||||
depends = qtbase qtwebsockets
|
||||
recommends = qtdeclarative
|
||||
|
||||
@@ -19,7 +19,7 @@ Configurations:
|
||||
-
|
||||
Template: 'qtci-windows-10-x86_64-15'
|
||||
Compiler: 'MSVC2019'
|
||||
Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake'
|
||||
Configure arguments: '-DCMAKE_BUILD_TYPE=Release -DBUILD_EXAMPLES=OFF -DCMAKE_TOOLCHAIN_FILE={{.Env.VCPKG_ROOT}}/scripts/buildsystems/vcpkg.cmake'
|
||||
-
|
||||
Template: 'qtci-linux-RHEL-7.6-x86_64'
|
||||
Compiler: 'GCC'
|
||||
|
||||
2
qtbase
2
qtbase
Submodule qtbase updated: d1be8b9ceb...cce8ada814
Submodule qtdeclarative updated: b106d86c43...7590f07278
Reference in New Issue
Block a user