lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-03-20 21:40:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update configurations and repositories to allow cmake binary packaging

Browse Source 
Disable qt5.git builds of repositories that have not been ported to
CMake yet.

Remove qmake configurations from qt5.yaml and default.yaml.
Add cmake configurations to qt5.yaml.
Add the Packaging feature to them.
Keep one configuration in qt5.yaml, because it's apparently illegal to
have it empty

All of this to test out if the binary package creation process can work
with the cmake artifacts.

Change-Id: Iebb6c4303fa2104765a7b0a71489560afe7df244
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Simon Hausmann <hausmann@gmail.com>
Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
This commit is contained in:
Alexandru Croitor
2020-04-24 11:05:13 +02:00
parent 7127f57038
commit 70bfcf5198
3 changed files with 32 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
.gitmodules vendored
View File

@@ -48,7 +48,7 @@
path = qttranslations
url = ../qttranslations.git
branch = dev
status = essential
status = ignore
priority = 30
[submodule "qtdoc"]
depends = qtdeclarative qttools
@@ -56,20 +56,20 @@
path = qtdoc
url = ../qtdoc.git
branch = dev
status = essential
status = ignore
priority = 40
[submodule "qtrepotools"]
path = qtrepotools
url = ../qtrepotools.git
branch = master
status = essential
status = ignore
project = -
[submodule "qtqa"]
depends = qtbase
path = qtqa
url = ../qtqa.git
branch = master
status = essential
status = ignore
priority = 50
[submodule "qtlocation"]
depends = qtbase
@@ -188,7 +188,7 @@
path = qtandroidextras
url = ../qtandroidextras.git
branch = dev
status = addon
status = ignore
[submodule "qtwebsockets"]
depends = qtbase
recommends = qtdeclarative
@@ -258,7 +258,7 @@
path = qtvirtualkeyboard
url = ../qtvirtualkeyboard.git
branch = dev
status = addon
status = ignore
[submodule "qtgamepad"]
depends = qtbase
recommends = qtdeclarative
@@ -310,13 +310,13 @@
path = qtquicktimeline
url = ../qtquicktimeline
branch = dev
status = addon
status = ignore
[submodule "qtquick3d"]
depends = qtbase qtdeclarative qtshadertools
path = qtquick3d
url = ../qtquick3d.git
branch = dev
status = addon
status = ignore
[submodule "qtshadertools"]
depends = qtbase
path = qtshadertools