diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-12-22 23:21:54 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-12-22 23:21:54 +0100 |
| commit | 0e82de327b0f764b1d48721d396189b10a36eaef (patch) | |
| tree | 6a0bd66602977f62618b1c3325afb79850b11290 /coin/platform_configs | |
| parent | db99f0563d6c3998a3cfd2b9521a7893564e981d (diff) | |
| parent | 061cf1f2ca98b961746784382e354208f3fc97f1 (diff) | |
Merge remote-tracking branch 'origin/5.12.0' into 5.12
Change-Id: Ifb4277657a6f85e6a6d0ee62e54360b2cb1c0514
Diffstat (limited to 'coin/platform_configs')
| -rw-r--r-- | coin/platform_configs/qt3d-runtime.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/coin/platform_configs/qt3d-runtime.txt b/coin/platform_configs/qt3d-runtime.txt index fdc51d6b..5a189f25 100644 --- a/coin/platform_configs/qt3d-runtime.txt +++ b/coin/platform_configs/qt3d-runtime.txt @@ -9,11 +9,12 @@ qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2017 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-macos-10.13-x86_64-2 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static 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 |