feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Merge commit 'd83fb4d63c9fd92e0e6f429cbd56fa244bddc093'

Browse Source 
Change-Id: Ibd6f8cd83c60f0c65387b62b7692aa8a4c025acb
This commit is contained in:
Eike Ziller
2015-02-12 15:30:15 +01:00
parent 052de4d178 d83fb4d63c
commit 0eabe62786
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/plugins/projectexplorer/msvctoolchain.cpp
View File

@@ -397,6 +397,11 @@ QList<Utils::FileName> MsvcToolChain::suggestedMkspecList() const
case Abi::WindowsMsvc2013Flavor: case Abi::WindowsMsvc2013Flavor:
return QList<Utils::FileName>() return QList<Utils::FileName>()
<< Utils::FileName::fromLatin1("win32-msvc2013") << Utils::FileName::fromLatin1("win32-msvc2013")
<< Utils::FileName::fromLatin1("winphone-arm-msvc2013")
<< Utils::FileName::fromLatin1("winphone-x86-msvc2013")
<< Utils::FileName::fromLatin1("winrt-arm-msvc2013")
<< Utils::FileName::fromLatin1("winrt-x86-msvc2013")
<< Utils::FileName::fromLatin1("winrt-x64-msvc2013")
<< Utils::FileName::fromLatin1("win32-msvc2012") << Utils::FileName::fromLatin1("win32-msvc2012")
<< Utils::FileName::fromLatin1("win32-msvc2010"); << Utils::FileName::fromLatin1("win32-msvc2010");
default: default:

2
src/plugins/winrt/winrtpackagedeploymentstep.cpp
View File

@@ -151,6 +151,8 @@ bool WinRtPackageDeploymentStep::processSucceeded(int exitCode, QProcess::ExitSt
QList<QPair<QString, QString> > installableFilesList; QList<QPair<QString, QString> > installableFilesList;
foreach (DeployableFile file, target()->deploymentData().allFiles()) { foreach (DeployableFile file, target()->deploymentData().allFiles()) {
QString remoteFilePath = file.remoteFilePath(); QString remoteFilePath = file.remoteFilePath();
while (remoteFilePath.startsWith(QLatin1Char('/')))
remoteFilePath.remove(0, 1);
QString localFilePath = file.localFilePath().toString(); QString localFilePath = file.localFilePath().toString();
if (localFilePath == m_targetFilePath) { if (localFilePath == m_targetFilePath) {
if (!m_targetFilePath.endsWith(QLatin1String(".exe"))) { if (!m_targetFilePath.endsWith(QLatin1String(".exe"))) {