diff options
author | Simo Fält <simo.falt@qt.io> | 2017-02-27 15:04:41 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-03-30 15:14:04 +0000 |
commit | 8b59bbc2a4012214e496bbd96d91ba8715ed6ee3 (patch) | |
tree | b6b3062d66723558a03c180b6166f2d8e5b59e60 /coin/platform_configs/default.txt | |
parent | 80b739b1e89cdc86d468a5707fa3951e8a307862 (diff) |
Coin provisioning: Use arg instead of autodetecting architecture
When provisioning windows machine, it seems that detecting architecture
by checking [System.Environment]::Is64BitProcess doesn't work properly.
Instead pass 32 or 64 as an argument when calling powershell script.
Change-Id: I890ad141b8ef194275848d0e656431753463cd2b
Reviewed-by: Heikki Halmet <heikki.halmet@qt.io>
Diffstat (limited to 'coin/platform_configs/default.txt')
-rw-r--r-- | coin/platform_configs/default.txt | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/coin/platform_configs/default.txt b/coin/platform_configs/default.txt index a8ab6e49..72f482d5 100644 --- a/coin/platform_configs/default.txt +++ b/coin/platform_configs/default.txt @@ -1,15 +1,15 @@ Template Target OS Target arch Compiler Features ----------------------------------- ------------------- ----------- ----------- ------------------------------------------------------------------------------------- -qtci-windows-8-x86_64 MSVC2013 DeveloperBuild Release BuildExamples -qtci-windows-8-x86_64 MSVC2012 DeveloperBuild Release QtNamespace QtLibInfix -qtci-windows-8-x86 MSVC2013 Packaging DebugAndRelease Release OpenGLDynamic -qtci-windows-8-x86_64 MSVC2013 Packaging DebugAndRelease Release OpenGLDynamic -qtci-windows-7-x86 MSVC2010 Release DeveloperBuild QtNamespace QtLibInfix OpenGLDynamic -qtci-windows-7-x86 Mingw49 Packaging DebugAndRelease Release OpenGLDynamic +qtci-windows-8-x86_64-2 MSVC2013 DeveloperBuild Release BuildExamples +qtci-windows-8-x86_64-2 MSVC2012 DeveloperBuild Release QtNamespace QtLibInfix +qtci-windows-8-x86-2 MSVC2013 Packaging DebugAndRelease Release OpenGLDynamic +qtci-windows-8-x86_64-2 MSVC2013 Packaging DebugAndRelease Release OpenGLDynamic +qtci-windows-7-x86-2 MSVC2010 Release DeveloperBuild QtNamespace QtLibInfix OpenGLDynamic +qtci-windows-7-x86-2 Mingw49 Packaging DebugAndRelease Release OpenGLDynamic qtci-windows-10-x86-3 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic qtci-windows-10-x86_64-3 MSVC2015 Packaging DebugAndRelease Release OpenGLDynamic -qtci-windows-8-x86_64 Windows_Phone_8_1 armv4 MSVC2013 Packaging DebugAndRelease Release DisableTests -qtci-windows-8-x86_64 WinRT_8_1 MSVC2013 Packaging DebugAndRelease Release DisableTests +qtci-windows-8-x86_64-2 Windows_Phone_8_1 armv4 MSVC2013 Packaging DebugAndRelease Release DisableTests +qtci-windows-8-x86_64-2 WinRT_8_1 MSVC2013 Packaging DebugAndRelease Release DisableTests qtci-linux-Ubuntu-14.04-x86_64 GCC NoWidgets ForceDebugInfo qtci-linux-Ubuntu-14.04-x86_64 GCC DeveloperBuild OutOfSourceBuild QtLibInfix QtNamespace qtci-linux-OpenSuSE-13.01-x86_64 GCC DeveloperBuild NoPch @@ -23,4 +23,4 @@ qtci-linux-RHEL-6.6-x86_64 Android_ANY armv7 GCC qtci-linux-Ubuntu-14.04-x86_64 Boot2Qt_Fido armv7 GCC DisableTests qtci-linux-RHEL-6.6-x86_64 QNX_660 armv7 GCC Packaging Release DisableTests OpenGLES2 NoUseGoldLinker qtci-linux-Ubuntu-14.04-x86_64 GCC TestOnly LicenseCheck -qtci-windows-7-x86 Windows_7_Embedded armv4 MSVC2008 DeveloperBuild Release DisableTests OpenGLES2 +qtci-windows-7-x86-2 Windows_7_Embedded armv4 MSVC2008 DeveloperBuild Release DisableTests OpenGLES2 |