aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitmodules6
-rw-r--r--coin/platform_configs/default.yaml2
2 files changed, 4 insertions, 4 deletions
diff --git a/.gitmodules b/.gitmodules
index f017e603..4715d803 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -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
diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml
index b0a717cc..5fcc5821 100644
--- a/coin/platform_configs/default.yaml
+++ b/coin/platform_configs/default.yaml
@@ -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'