From 770621c0fe593722c362a98f44fa8b9813d89694 Mon Sep 17 00:00:00 2001 From: Maurice Kalinowski Date: Thu, 15 Jan 2015 12:14:08 +0100 Subject: [PATCH 1/2] WinRT: Clean up target path for mapping file The target inside the mapping file must not start with a slash. However one must specify a path value in the deployment rules, otherwise it will be ignored internally. Task-number: QTCREATORBUG-13835 Change-Id: Ic44cd6bc8c5fd7d48a3a980de566b492180c77fd Reviewed-by: Oliver Wolff --- src/plugins/winrt/winrtpackagedeploymentstep.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/plugins/winrt/winrtpackagedeploymentstep.cpp b/src/plugins/winrt/winrtpackagedeploymentstep.cpp index 71f902d66e0..4d072a59a93 100644 --- a/src/plugins/winrt/winrtpackagedeploymentstep.cpp +++ b/src/plugins/winrt/winrtpackagedeploymentstep.cpp @@ -151,6 +151,8 @@ bool WinRtPackageDeploymentStep::processSucceeded(int exitCode, QProcess::ExitSt QList > installableFilesList; foreach (DeployableFile file, target()->deploymentData().allFiles()) { QString remoteFilePath = file.remoteFilePath(); + while (remoteFilePath.startsWith(QLatin1Char('/'))) + remoteFilePath.remove(0, 1); QString localFilePath = file.localFilePath().toString(); if (localFilePath == m_targetFilePath) { if (!m_targetFilePath.endsWith(QLatin1String(".exe"))) { From d83fb4d63c9fd92e0e6f429cbd56fa244bddc093 Mon Sep 17 00:00:00 2001 From: David Schulz Date: Wed, 14 Jan 2015 14:15:38 +0100 Subject: [PATCH 2/2] ProjectExplorer: Suggest Winphone and WinRT mkspecs... ... for MSVC 2013 toolchains. Change-Id: Idcf1aa523d819989091ddadeecdd26d07cfd2e8b Reviewed-by: Maurice Kalinowski --- src/plugins/projectexplorer/msvctoolchain.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/plugins/projectexplorer/msvctoolchain.cpp b/src/plugins/projectexplorer/msvctoolchain.cpp index 082738c58e4..25526160e0e 100644 --- a/src/plugins/projectexplorer/msvctoolchain.cpp +++ b/src/plugins/projectexplorer/msvctoolchain.cpp @@ -397,6 +397,11 @@ QList MsvcToolChain::suggestedMkspecList() const case Abi::WindowsMsvc2013Flavor: return QList() << 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-msvc2010"); default: