summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAkseli Salovaara <akseli.salovaara@qt.io>2017-08-15 12:12:22 +0300
committerJani Heikkinen <jani.heikkinen@qt.io>2017-09-04 07:10:14 +0000
commit4e1f4665c5ed631e18d2fa4910fd1a612b40539a (patch)
tree094c4446e75895fefa185f6f19b07551b598760b
parent42b502f7bcf39da693739b313495980a1440a08a (diff)
Build Windows MSVC2013 & MSVC2015 32bit binaries on 64bit host
From Qt 5.6.3 onwards building QtWebEngine Windows 32bit binaries requires Windows 64bit machine. Linking requires more RAM than Windows 32bit can address. Change MSVC2013 & MSVC2015 integration host machines accordingly. Change-Id: I5b88536507dcf59efd124d4e8c3ead79772021fb Reviewed-by: Jani Heikkinen <jani.heikkinen@qt.io>
-rw-r--r--coin/platform_configs/default.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt
index 191e59d4..c41f3d7f 100644
--- a/coin/platform_configs/default.txt
+++ b/coin/platform_configs/default.txt
@@ -2,11 +2,11 @@ Template Target OS Target arch Compiler
----------------------------------- ------------------- ----------- ----------- -------------------------------------------------------------------------------------
qtci-windows-8.1-x86_64 MSVC2013 DeveloperBuild Release BuildExamples
qtci-windows-8.1-x86_64 MSVC2012 DeveloperBuild Release QtNamespace QtLibInfix
-qtci-windows-8.1-x86 MSVC2013 Packaging DebugAndRelease Release OpenGLDynamic UploadConfigureExe
+qtci-windows-8.1-x86_64 x86 MSVC2013 Packaging DebugAndRelease Release OpenGLDynamic UploadConfigureExe
qtci-windows-8.1-x86_64 MSVC2013 Packaging DebugAndRelease Release OpenGLDynamic UploadConfigureExe
qtci-windows-7-x86-2 MSVC2010 Release DeveloperBuild QtNamespace QtLibInfix OpenGLDynamic
qtci-windows-7-x86-2 Mingw49 Packaging DebugAndRelease Release OpenGLDynamic UploadConfigureExe
-qtci-windows-10-x86-6 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic UploadConfigureExe
+qtci-windows-10-x86_64-8 x86 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic UploadConfigureExe
qtci-windows-10-x86_64-8 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic UploadConfigureExe
qtci-linux-Ubuntu-14.04-x86_64-1 GCC NoWidgets ForceDebugInfo
qtci-linux-Ubuntu-14.04-x86_64-1 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace Documentation