diff options
author | Heikki Halmet <heikki.halmet@qt.io> | 2017-04-12 14:25:31 +0300 |
---|---|---|
committer | Heikki Halmet <heikki.halmet@qt.io> | 2017-04-13 12:31:58 +0000 |
commit | e48d65315076311b0e371efc4533aacb839b9418 (patch) | |
tree | 3e8d5d408d63cec2c73e4fb5081206e6918d6b13 /coin/platform_configs/qt5.txt | |
parent | b8211774d91aa64e1dcfab7c53135f45c2702878 (diff) |
Provisioning: Change tier1 templates for Windows 10
These tier 1 templates includes changes needed by 5.9, but we can use
these same tier 1 templates for 5.6 also
Change-Id: I3ad0d75ab89f7b6502b758fb94f984cc6e0b7f16
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'coin/platform_configs/qt5.txt')
-rw-r--r-- | coin/platform_configs/qt5.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 3f9f3186..0494e964 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -1,8 +1,8 @@ Template Target OS Target arch Compiler Features --------------------------- ------------------- ----------- ----------- ----------------------------------------------------------------------------------------------- qtci-windows-8-x86_64-2 Windows_Phone_8_1 x86 MSVC2013 Packaging DebugAndRelease Release DisableTests -qtci-windows-10-x86_64-3 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release DisableTests -qtci-windows-10-x86_64-3 WinRT_10 MSVC2015 Packaging DebugAndRelease Release DisableTests +qtci-windows-10-x86_64-5 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release DisableTests +qtci-windows-10-x86_64-5 WinRT_10 MSVC2015 Packaging DebugAndRelease Release DisableTests qtci-linux-RHEL-6.6-x86_64 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-windows-7-x86-2 Android_ANY armv7 Mingw49 Packaging Release DisableTests OpenGLES2 qtci-windows-7-x86-2 Android_ANY x86 Mingw49 Packaging Release DisableTests OpenGLES2 @@ -12,6 +12,6 @@ qtci-linux-RHEL-6.6-x86_64 QNX_660 x86 GCC Packagin qtci-windows-7-x86-2 QNX_660 armv7 Mingw49 Packaging Release DisableTests OpenGLES2 qtci-windows-7-x86-2 QNX_660 x86 Mingw49 Packaging Release DisableTests OpenGLES2 # target arch is used here only for documentation the value is ignored -qtci-windows-10-x86_64-3 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release DisableTests +qtci-windows-10-x86_64-5 WinRT_10 armv7 MSVC2015 Packaging DebugAndRelease Release DisableTests qtci-osx-10.11-x86_64 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static |