diff options
author | Liang Qi <liang.qi@qt.io> | 2017-10-05 12:47:24 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2017-10-05 12:47:24 +0200 |
commit | 1099b1ddcef203df81d4d19cecba8b2813d413d7 (patch) | |
tree | 0abc9f9cee5fa597a8d8bb3ebf64cd9ba6b9d06e /coin/platform_configs/qt5.txt | |
parent | cdab32be2368ffd234c9ace4233916cfc3682563 (diff) | |
parent | 9a096e6841e38c79fa3c81036e5d8c5b1e792e5c (diff) |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
.gitmodules
coin/platform_configs/qt5.txt
Change-Id: I4dee3bb4aab69430fc013ce509e20b7a9b9e4f47
Diffstat (limited to 'coin/platform_configs/qt5.txt')
-rw-r--r-- | coin/platform_configs/qt5.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 0a4d901c..4b7465ef 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -1,6 +1,6 @@ Template Target OS Target arch Compiler Features --------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-windows-8-x86-2 MSVC2013 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests +qtci-windows-8.1-x86_64 x86 MSVC2013 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests qtci-windows-8.1-x86_64 MSVC2013 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests qtci-windows-10-x86_64-7 WinRT_10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests qtci-windows-10-x86-6 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic @@ -17,8 +17,10 @@ qtci-macos-10.12-x86_64-8 Android_ANY x86 GCC Packagin qtci-linux-RHEL-6.6-x86_64 QNX_660 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-RHEL-7.2-x86_64 QNX_700 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-RHEL-7.2-x86_64 QNX_700 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker +qtci-windows-10-x86_64-7 QNX_700 armv7 Mingw53 Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-7 QNX_700 x86 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-macos-10.12-x86_64-8 QNX_700 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker -qtci-osx-10.10-x86_64 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static +qtci-macos-10.12-x86_64-8 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static qtci-macos-10.12-x86_64-8 TvOS_ANY multi Clang DebugAndRelease DisableTests qtci-macos-10.12-x86_64-8 WatchOS_ANY multi Clang DebugAndRelease DisableTests qtci-linux-RHEL-7.2-x86_64 INTEGRITY_11_04 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker |