diff options
| author | Andrew Knight <andrew.knight@digia.com> | 2013-07-26 00:31:29 +0300 |
|---|---|---|
| committer | Andrew Knight <andrew.knight@digia.com> | 2013-07-26 09:12:05 +0200 |
| commit | 6dab15e9cddd509b3fb6af397df10958317476e1 (patch) | |
| tree | 756dd252dab06e454ae4365ab6021faf952c183b | |
| parent | 63cf3c45e006b34065ff6251c9780ceec29a44ba (diff) | |
| download | qt-creator-wip/winrt.tar.gz | |
Add Phone SDKs to MSVC toolchainswip/winrt
These function like ordinary MSVC autodetected toolchains.
Change-Id: I05a336a14dd6593f24554fda15bf2f621cd761b4
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
| -rw-r--r-- | src/plugins/projectexplorer/msvctoolchain.cpp | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/src/plugins/projectexplorer/msvctoolchain.cpp b/src/plugins/projectexplorer/msvctoolchain.cpp index 63a3b9bdb4..dbf9adb427 100644 --- a/src/plugins/projectexplorer/msvctoolchain.cpp +++ b/src/plugins/projectexplorer/msvctoolchain.cpp @@ -588,9 +588,29 @@ QList<ToolChain *> MsvcToolChainFactory::autoDetect() findAbiOfMsvc(MsvcToolChain::VS, MsvcToolChain::ia64, vsName), vcvarsAllbat, QLatin1String("x86_ia64"), true)); } + } else { qWarning("Unable to find MSVC setup script %s in version %d", qPrintable(vcvarsAllbat), version); } + + // Detect Phone SDKs + if (version >= 11) { + const QString phonePath = path += QLatin1String("/WPSDK/WP80"); + const QString vcvarsPhoneAllbat = phonePath + QLatin1String("/vcvarsphoneall.bat"); + const QString vsPhoneName = vsName + QLatin1String(" for Windows Phone"); + if (QFileInfo(vcvarsPhoneAllbat).isFile()) { + if (QFileInfo(phonePath + QLatin1String("/bin/vcvarsphonex86.bat")).isFile()) + results.append(new MsvcToolChain(generateDisplayName(vsPhoneName, MsvcToolChain::VS, MsvcToolChain::x86), + findAbiOfMsvc(MsvcToolChain::VS, MsvcToolChain::x86, vsName), + vcvarsPhoneAllbat, QLatin1String("x86"), true)); + + if (QFileInfo(phonePath + QLatin1String("/bin/x86_arm/vcvarsphonex86_arm.bat")).isFile()) + results.append(new MsvcToolChain(generateDisplayName(vsPhoneName, MsvcToolChain::VS, MsvcToolChain::arm), + findAbiOfMsvc(MsvcToolChain::VS, MsvcToolChain::arm, vsName), + vcvarsPhoneAllbat, QLatin1String("x86_arm"), true)); + + } + } } return results; |