diff options
author | Liang Qi <liang.qi@qt.io> | 2019-08-04 11:51:40 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-08-04 11:51:40 +0200 |
commit | 58977376e17870184a0da64065563b16b4a11f39 (patch) | |
tree | 2a1d9a7d5ad3d6aa2ff617a87d5a7f563dfb630c /coin/platform_configs | |
parent | 689ed30f2a0a05f7aba7debeb2554bb8baaa3544 (diff) | |
parent | 9da27c5808b6f5eda84ef75ce96a0259c7d92d41 (diff) |
Merge remote-tracking branch 'origin/5.12' into 5.13
Change-Id: Ie49f7e5ff9ca02522c6611922b47870aba2c152e
Diffstat (limited to 'coin/platform_configs')
-rw-r--r-- | coin/platform_configs/default.yaml | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/coin/platform_configs/default.yaml b/coin/platform_configs/default.yaml index 47792f9c..45eb2763 100644 --- a/coin/platform_configs/default.yaml +++ b/coin/platform_configs/default.yaml @@ -82,6 +82,11 @@ 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' |