From a36e031cf56d3a02be111255f1ca7070e016a9ae Mon Sep 17 00:00:00 2001 From: Ville Nummela Date: Mon, 25 May 2020 10:59:39 +0300 Subject: [PATCH] ProjectExplorer: Split deployment data using last colon on the line The original approach does not work with absolute file paths on Windows Change-Id: I9f284dfa7c0fe145a99e216a571d3f0eb1289f94 Reviewed-by: Christian Kandeler --- src/plugins/projectexplorer/deploymentdata.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/plugins/projectexplorer/deploymentdata.cpp b/src/plugins/projectexplorer/deploymentdata.cpp index 1d9943ae59a..4d4aec4a12f 100644 --- a/src/plugins/projectexplorer/deploymentdata.cpp +++ b/src/plugins/projectexplorer/deploymentdata.cpp @@ -87,11 +87,11 @@ QString DeploymentData::addFilesFromDeploymentFile(const QString &deploymentFile QString line = deploymentStream.readLine(); if (!line.contains(':')) continue; - QStringList file = line.split(':'); - QString sourceFile = file.at(0); + int splitPoint = line.lastIndexOf(':'); + QString sourceFile = line.left(splitPoint); if (QFileInfo(sourceFile).isRelative()) sourceFile.prepend(sourcePrefix); - QString targetFile = file.at(1); + QString targetFile = line.mid(splitPoint + 1); if (QFileInfo(targetFile).isRelative()) targetFile.prepend(deploymentPrefix); addFile(sourceFile, targetFile);