diff options
author | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-05-12 17:53:48 +0200 |
---|---|---|
committer | Alexandru Croitor <alexandru.croitor@qt.io> | 2020-05-12 17:53:48 +0200 |
commit | 747657c00c07b3989df674051581a94ae584526c (patch) | |
tree | 4d62f01b354eef0decb996a54b84c15ce9566519 /coin/platform_configs/qtwayland.yaml | |
parent | 70bfcf5198928469318468f788371e3f06f5491e (diff) | |
parent | e4d60dd1171531baa52284590537e9e7ba7c2d4e (diff) |
Merge remote-tracking branch 'origin/dev' into wip/cmake
Conflicts:
coin/platform_configs/default.yaml
coin/platform_configs/qt5.yaml
Change-Id: Ic4ed934ea7015dc66472ab2f9dd45844b25522b8
Diffstat (limited to 'coin/platform_configs/qtwayland.yaml')
-rw-r--r-- | coin/platform_configs/qtwayland.yaml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/coin/platform_configs/qtwayland.yaml b/coin/platform_configs/qtwayland.yaml index eff1e627..e0dd1697 100644 --- a/coin/platform_configs/qtwayland.yaml +++ b/coin/platform_configs/qtwayland.yaml @@ -5,13 +5,13 @@ Configurations: Compiler: 'GCC' Configure arguments: '-DBUILD_EXAMPLES=ON -DFEATURE_developer_build=ON -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}' - - Template: 'qtci-linux-openSUSE-15.0-x86_64' + Template: 'qtci-linux-openSUSE-15.1-x86_64' Compiler: 'GCC' Configure arguments: '-DBUILD_EXAMPLES=OFF -DBUILD_SHARED_LIBS=OFF -DOPENSSL_ROOT_DIR={{.Env.OPENSSL_HOME}}' - Template: 'qtci-macos-10.14-x86_64' Compiler: 'Clang' - 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' |