diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-04-17 15:30:13 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-04-17 18:34:04 +0000 |
| commit | 8b4e259b223355a96f71b0b2dca861e821a5549a (patch) | |
| tree | a8e86df47f2cd997333670dd9e937b06e414db36 /coin/platform_configs/qt5.txt | |
| parent | 18999572b4b624d965004fa11c3b04b5a83eddfb (diff) | |
| parent | ada6b6601146e01e0736ac5fbc0c1c955489c706 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Change-Id: Iddf09c38c811979458639c759056a032187493de
Diffstat (limited to 'coin/platform_configs/qt5.txt')
| -rw-r--r-- | coin/platform_configs/qt5.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt index 738416d7..e6e5dfee 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-10-x86_64-3 WinRT_10 MSVC2015 Packaging DebugAndRelease Release DisableTests +qtci-windows-10-x86_64-5 WinRT_10 MSVC2015 Packaging DebugAndRelease Release DisableTests qtci-linux-RHEL-7.2-x86_64 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-windows-7-x86-2 Android_ANY armv7 Mingw53 Packaging Release DisableTests OpenGLES2 qtci-windows-7-x86-2 Android_ANY x86 Mingw53 Packaging Release DisableTests OpenGLES2 |