diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-05-02 12:15:39 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-05-02 17:16:22 +0000 |
| commit | 4ee0e8fb460273470187210170c0ccbbbdefe30e (patch) | |
| tree | c5e51fb7acba46b95e4ccfa5255471a4b7dfc4e1 /coin/platform_configs/qt5.txt | |
| parent | 385ecebe80996035b218d0de9ffffe7a3c059a43 (diff) | |
Fix tier1 template selection for QNX 7 builds on Windows
Use the latest windows 10 template, not something outdated.
Amends e3e30b4a2b037d6bd4140b381b8051e1a52da646 with the tier1 update
from commit 070d9333a6fc768526479edd2b81bba9e030f655.
Change-Id: I92bae3d971e8ad7190d883a057968a6583d34ff7
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Diffstat (limited to 'coin/platform_configs/qt5.txt')
| -rw-r--r-- | coin/platform_configs/qt5.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index c89ac36f..e73ec703 100644 --- a/coin/platform_configs/qt5.txt +++ b/coin/platform_configs/qt5.txt @@ -13,7 +13,7 @@ qtci-linux-RHEL-6.6-x86_64 QNX_660 armv7 GCC Packagin qtci-linux-RHEL-7.2-x86_64 QNX_700 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-windows-7-x86-2 QNX_660 armv7 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-windows-7-x86-2 QNX_660 x86 Mingw53 Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-3 QNX_700 armv7 Mingw53 Packaging Release DisableTests OpenGLES2 -qtci-windows-10-x86_64-3 QNX_700 x86 Mingw53 Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-6 QNX_700 armv7 Mingw53 Packaging Release DisableTests OpenGLES2 +qtci-windows-10-x86_64-6 QNX_700 x86 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-osx-10.10-x86_64 IOS_ANY multi Clang Packaging DebugAndRelease DisableTests Static qtci-linux-RHEL-7.2-x86_64 INTEGRITY_11_04 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker |