diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-12-14 11:49:07 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-12-14 11:49:07 +0100 |
| commit | def11da274cc4af1ba15bdc43fe7aac74bb40d49 (patch) | |
| tree | 65523361f6e2371f135abb0c0b7c40a9f808b05f /coin/platform_configs/qtwebkit.txt | |
| parent | 44eaaf374a2c4cc0e370f84c561a7aaaa23f4096 (diff) | |
| parent | eccfaf1f506ceb46016e385c1a2707461811def2 (diff) | |
Merge remote-tracking branch 'origin/5.10' into dev
Conflicts:
coin/platform_configs/qt5.txt
Change-Id: I9ad5a004544bf2f368ee1aaad247c4db3b36b162
Diffstat (limited to 'coin/platform_configs/qtwebkit.txt')
| -rw-r--r-- | coin/platform_configs/qtwebkit.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/coin/platform_configs/qtwebkit.txt b/coin/platform_configs/qtwebkit.txt index 7c8e8ac5..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-7-x86-2 Mingw53 Packaging DebugAndRelease Release 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 |