diff options
| author | Oliver Wolff <oliver.wolff@theqtcompany.com> | 2015-02-18 13:05:33 +0100 |
|---|---|---|
| committer | Oliver Wolff <oliver.wolff@theqtcompany.com> | 2015-02-18 12:45:52 +0000 |
| commit | a780ddc873b608e1f11f2d91457420720a6d3915 (patch) | |
| tree | 15c177b50eccc175106a715c7c44a1d6f26884ea | |
| parent | e84770b794697ba684ee172a0b5245deb9051de0 (diff) | |
MSVC: Prioritize x86_arm cross compiler over x64_arm
Windows Phone and WinRT builds only support the x86_arm cross compiler.
With this change this behavior is auto detected by Qt Creator for these
builds (due to being higher prioritized). As soon as Windows Phone/WinRT
builds support cross compilation from x64, this change can be reverted.
Task-number: QTBUG-44530
Change-Id: I16ffe47c4582f51abdb6ef57b5922eb13863fd4e
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>
| -rw-r--r-- | src/plugins/projectexplorer/msvctoolchain.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/plugins/projectexplorer/msvctoolchain.cpp b/src/plugins/projectexplorer/msvctoolchain.cpp index 74bbe7f0b8..05e1de44e8 100644 --- a/src/plugins/projectexplorer/msvctoolchain.cpp +++ b/src/plugins/projectexplorer/msvctoolchain.cpp @@ -586,9 +586,12 @@ QList<ToolChain *> MsvcToolChainFactory::autoDetect() const QString vcvarsAllbat = path + QLatin1String("/vcvarsall.bat"); if (QFileInfo(vcvarsAllbat).isFile()) { QList<MsvcToolChain::Platform> platforms; // prioritized list + // x86_arm was put before amd64_arm as a workaround for auto detected windows phone + // toolchains. As soon as windows phone builds support x64 cross builds, this change + // can be reverted. platforms << MsvcToolChain::x86 << MsvcToolChain::amd64 << MsvcToolChain::x86_amd64 - << MsvcToolChain::arm << MsvcToolChain::amd64_arm << MsvcToolChain::x86_arm + << MsvcToolChain::arm << MsvcToolChain::x86_arm << MsvcToolChain::amd64_arm << MsvcToolChain::ia64 << MsvcToolChain::x86_ia64; foreach (const MsvcToolChain::Platform &platform, platforms) { if (hostSupportsPlatform(platform) |