aboutsummaryrefslogtreecommitdiffstats
path: root/coin/platform_configs
diff options
context:
space:
mode:
authorTony Sarajärvi <tony.sarajarvi@qt.io>2017-09-03 08:30:17 +0300
committerTony Sarajärvi <tony.sarajarvi@qt.io>2017-10-24 12:53:26 +0000
commit372d2bb0764724cd5239ad47ad71927eef7ab090 (patch)
tree98bd5f4e05d1ae1f0b6e9b71d1a82fb4be820245 /coin/platform_configs
parent3b7b924b31f28c38068e99d4637a90e34362a685 (diff)
Provision vanilla Windows 7 x86 and use it
Change-Id: I96eefe2e69b5cbe5d68329be2bb4273d03bb85ca Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Diffstat (limited to 'coin/platform_configs')
-rw-r--r--coin/platform_configs/default.txt2
-rw-r--r--coin/platform_configs/qt5.txt6
-rw-r--r--coin/platform_configs/qtwebkit.txt2
3 files changed, 5 insertions, 5 deletions
diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt
index ea31b802..672b22a2 100644
--- a/coin/platform_configs/default.txt
+++ b/coin/platform_configs/default.txt
@@ -2,7 +2,7 @@ Template Target OS Target arch Compiler
----------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
qtci-windows-8.1-x86_64 MSVC2013 DeveloperBuild Release DisableTests
qtci-windows-10-x86_64-10 MSVC2015 DeveloperBuild Release QtNamespace QtLibInfix BuildExamples
-qtci-windows-7-x86-2 Mingw53 DeveloperBuild Release OpenGLDynamic
+qtci-windows-7-x86-3 Mingw53 DeveloperBuild Release OpenGLDynamic
qtci-windows-10-x86_64-10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
qtci-windows-10-x86_64-10 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2015 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
diff --git a/coin/platform_configs/qt5.txt b/coin/platform_configs/qt5.txt
index 0a4da169..5eea413c 100644
--- a/coin/platform_configs/qt5.txt
+++ b/coin/platform_configs/qt5.txt
@@ -6,12 +6,12 @@ qtci-windows-10-x86_64-10 WinRT_10 MSVC2015 Packagi
qtci-windows-10-x86-6 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
qtci-windows-10-x86_64-10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo OpenGLDynamic
qtci-windows-10-x86_64-10 WinRT_10 x86 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
-qtci-windows-7-x86-2 Mingw53 Packaging DebugAndRelease Release OpenGLDynamic DisableTests
+qtci-windows-7-x86-3 Mingw53 Packaging DebugAndRelease Release OpenGLDynamic DisableTests
qtci-windows-10-x86_64-10 WinRT_10 armv7 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-windows-10-x86_64-10 WinRT_10 MSVC2017 Packaging DebugAndRelease Release ForceDebugInfo DisableTests
qtci-linux-RHEL-7.4-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
+qtci-windows-7-x86-3 Android_ANY armv7 Mingw53 Packaging Release DisableTests OpenGLES2
+qtci-windows-7-x86-3 Android_ANY x86 Mingw53 Packaging Release DisableTests OpenGLES2
qtci-macos-10.12-x86_64-8 Android_ANY armv7 GCC Packaging Release DisableTests OpenGLES2
qtci-macos-10.12-x86_64-8 Android_ANY x86 GCC Packaging Release DisableTests OpenGLES2
qtci-linux-RHEL-6.6-x86_64 QNX_660 x86 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker
diff --git a/coin/platform_configs/qtwebkit.txt b/coin/platform_configs/qtwebkit.txt
index 7c8e8ac5..521191bb 100644
--- a/coin/platform_configs/qtwebkit.txt
+++ b/coin/platform_configs/qtwebkit.txt
@@ -2,4 +2,4 @@ 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-7-x86-3 Mingw53 Packaging DebugAndRelease Release OpenGLDynamic DisableTests