diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-11-16 23:14:25 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-11-16 23:14:25 +0100 |
| commit | 062b29b311cc87f438d7a6d5d5b5bfb8142fb7df (patch) | |
| tree | efd30f31dc86008734d902673309215377aedffe /coin/platform_configs | |
| parent | 26fda37639ce3c062eba550c9d87dc367b2b1c0c (diff) | |
| parent | 329d718a1910f7b8e53b9d2feea2dc7a64b54adb (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: Iac3073d85bd94d27c296b307a827ee6bd97c4194
Diffstat (limited to 'coin/platform_configs')
| -rw-r--r-- | coin/platform_configs/qtwebkit.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/coin/platform_configs/qtwebkit.txt b/coin/platform_configs/qtwebkit.txt index 521191bb..b3dc74f7 100644 --- a/coin/platform_configs/qtwebkit.txt +++ b/coin/platform_configs/qtwebkit.txt @@ -1,5 +1,5 @@ Template Target OS Target arch Compiler Features --------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-windows-10-x86_64-7 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests -qtci-windows-10-x86_64-7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests +qtci-windows-10-x86_64-10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests +qtci-windows-10-x86_64-10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic DisableTests qtci-windows-7-x86-3 Mingw53 Packaging DebugAndRelease Release OpenGLDynamic DisableTests |