diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-02-27 12:43:22 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-02-27 12:43:22 +0100 |
| commit | 2d0e6b81ddabbaa1dad257c47e40ee758af17b39 (patch) | |
| tree | 1ed1ec9e62afb4001326c9126cd4d5472761c58f /coin/platform_configs | |
| parent | 4e99a6976cae711cb4d456d137088b2acb99f96f (diff) | |
| parent | 1c6f272dd0a0a43af85428efbe6d640a7a9803f6 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
coin/provisioning/common/windows/android-openssl.ps1
Change-Id: I0755066ece5458040a21b3da6ddbc1656240f5bb
Diffstat (limited to 'coin/platform_configs')
| -rw-r--r-- | coin/platform_configs/default.txt | 2 | ||||
| l---------[-rw-r--r--] | coin/platform_configs/qt3d-runtime.txt | 23 | ||||
| -rw-r--r-- | coin/platform_configs/qtsaferenderer.txt | 3 | ||||
| -rw-r--r-- | coin/platform_configs/tqtc-qtsaferenderer.txt | 4 |
4 files changed, 5 insertions, 27 deletions
diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index 90095639..14f89e80 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -1,6 +1,6 @@ Template Target OS Target arch Compiler Target Compiler Features ----------------------------------- ------------------- ----------- ----------- --------------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-10 MSVC2015 DeveloperBuild Release QtNamespace QtLibInfix BuildExamples +qtci-windows-10-x86_64-10 MSVC2015 DeveloperBuild Release QtNamespace QtLibInfix BuildExamples OpenGLAngle qtci-windows-7-x86-3 Mingw73 DeveloperBuild Release OpenGLDynamic qtci-windows-10-x86_64-10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic qtci-windows-10-x86_64-10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic diff --git a/coin/platform_configs/qt3d-runtime.txt b/coin/platform_configs/qt3d-runtime.txt index 5a189f25..9b3b4cd8 100644..120000 --- a/coin/platform_configs/qt3d-runtime.txt +++ b/coin/platform_configs/qt3d-runtime.txt @@ -1,22 +1 @@ -Template Target OS Target arch Compiler Target Compiler Features ---------------------------- ------------------- ----------- ----------- --------------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-10 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic -qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-7-x86-3 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests -qtci-windows-10-x86_64-10 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests -qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-10 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-linux-RHEL-7.4-x86_64 Android_ANY x86 GCC Clang Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-windows-7-x86-3 Android_ANY armv7 Mingw73 Clang Packaging Release DisableTests OpenGLES2 -qtci-windows-7-x86-3 Android_ANY arm64 Mingw73 Clang Packaging Release DisableTests OpenGLES2 -qtci-windows-7-x86-3 Android_ANY x86 Mingw73 Clang Packaging Release DisableTests OpenGLES2 -qtci-macos-10.13-x86_64-2 Android_ANY armv7 Clang Clang Packaging Release DisableTests OpenGLES2 -qtci-macos-10.13-x86_64-2 Android_ANY arm64 Clang Clang Packaging Release DisableTests OpenGLES2 -qtci-macos-10.13-x86_64-2 Android_ANY x86 Clang Clang Packaging Release DisableTests OpenGLES2 -qtci-macos-10.13-x86_64-2 QNX_700 x86 GCC Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-windows-10-x86_64-10 QNX_700 armv7 Mingw73 Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 QNX_700 armv8 Mingw73 Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-10 QNX_700 x86_64 Mingw73 Packaging Release DisableTests OpenGLES2 -qtci-linux-RHEL-7.4-x86_64 QNX_700 armv8 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-linux-RHEL-7.4-x86_64 QNX_700 x86_64 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qt5.txt
\ No newline at end of file diff --git a/coin/platform_configs/qtsaferenderer.txt b/coin/platform_configs/qtsaferenderer.txt new file mode 100644 index 00000000..ec14f610 --- /dev/null +++ b/coin/platform_configs/qtsaferenderer.txt @@ -0,0 +1,3 @@ +Template Target OS Target arch Compiler Features +----------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- +qtci-windows-10-x86_64-10 Mingw73 DeveloperBuild Release OpenGLDynamic BuildExamples diff --git a/coin/platform_configs/tqtc-qtsaferenderer.txt b/coin/platform_configs/tqtc-qtsaferenderer.txt deleted file mode 100644 index 0391b5d7..00000000 --- a/coin/platform_configs/tqtc-qtsaferenderer.txt +++ /dev/null @@ -1,4 +0,0 @@ -Template Target OS Target arch Compiler Features ------------------------------------ ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-linux-Ubuntu-16.04-x86_64-2 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace BuildExamples Documentation -qtci-linux-RHEL-7.4-x86_64 QNX_700 armv7 GCC Release DisableTests OpenGLES2 NoUseGoldLinker |