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

CMake: Update configurations and modules similar to the ones in dev

Browse Source 
Change-Id: Ia47878715b27c265b00982c71f36ffc5fe1f44d4
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Alexandru Croitor
2020-05-12 18:00:03 +02:00
parent 747657c00c
commit 318d651b44
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.gitmodules vendored
View File

@@ -188,7 +188,7 @@
path = qtandroidextras
url = ../qtandroidextras.git
branch = dev
status = ignore
status = addon
[submodule "qtwebsockets"]
depends = qtbase
recommends = qtdeclarative
@@ -258,7 +258,7 @@
path = qtvirtualkeyboard
url = ../qtvirtualkeyboard.git
branch = dev
status = ignore
status = addon
[submodule "qtgamepad"]
depends = qtbase
recommends = qtdeclarative
@@ -316,7 +316,7 @@
path = qtquick3d
url = ../qtquick3d.git
branch = dev
status = ignore
status = addon
[submodule "qtshadertools"]
depends = qtbase
path = qtshadertools

2
coin/platform_configs/default.yaml
View File

@@ -4,7 +4,7 @@ Configurations:
Template: 'qtci-macos-10.14-x86_64'
Compiler: 'Clang'
Features: ['Packaging']
Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl'
Configure arguments: '-DBUILD_EXAMPLES=OFF -DCMAKE_BUILD_TYPE=RelWithDebInfo -DFEATURE_framework=ON -DCMAKE_OSX_SYSROOT:PATH=/Applications/Xcode11.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.15.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.14 -DOPENSSL_ROOT_DIR=/usr/local/opt/openssl'
-
Template: 'qtci-windows-10-x86_64-15'
Compiler: 'MSVC2019'