diff options
| author | Liang Qi <liang.qi@qt.io> | 2019-04-13 11:38:39 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2019-04-13 11:38:39 +0200 |
| commit | 8710c7d9cf90ad7ab542451b3fb36bb97011a8aa (patch) | |
| tree | 0e60ea439dae4b823bc910fb85cef488754092e1 /coin/platform_configs/qt3d-runtime.txt | |
| parent | 869c15629d8397bc725c61da423a4a038ef4d395 (diff) | |
| parent | f31970d5ac48cd2ae6601aca32738ea718edb265 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
Conflicts:
coin/platform_configs/qt3d-runtime.txt
coin/platform_configs/qt5.txt
coin/provisioning/qtci-linux-Ubuntu-18.04-x86_64/04-yocto.sh
coin/provisioning/qtci-macos-10.13-x86_64/30-android.sh
Change-Id: Ie428600c72b7fe4d7b5fa7583e11aebd47cfb85e
Diffstat (limited to 'coin/platform_configs/qt3d-runtime.txt')
| -rw-r--r-- | coin/platform_configs/qt3d-runtime.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/coin/platform_configs/qt3d-runtime.txt b/coin/platform_configs/qt3d-runtime.txt index 0072dfe3..1001d869 100644 --- a/coin/platform_configs/qt3d-runtime.txt +++ b/coin/platform_configs/qt3d-runtime.txt @@ -1,7 +1,6 @@ Template Target OS Target arch Compiler Target Compiler Features --------------------------- ------------------- ----------- ----------- --------------- ------------------------------------------------------------------------------------- qtci-windows-10-x86_64-14 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests -qtci-windows-10-x86_64-14 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic qtci-windows-10-x86_64-14 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-14 Mingw73 Packaging DebugAndRelease Release OpenGLDynamic DisableTests |