From c59766da4d8e105abb0a9127d9d26c2adf3add1c Mon Sep 17 00:00:00 2001
From: Christian Kandeler <christian.kandeler@nokia.com>
Date: Thu, 29 Mar 2012 10:24:32 +0200
Subject: [PATCH] RemoteLinux: Change installation prefix logic.
Specifying relative remote paths is problematic, since
they can easily be expanded locally. So we just prepend
the prefix to all paths.
Change-Id: I629ec49ed219440c70bf3ab75024e2cec2bd83a5
Reviewed-by: Alessandro Portale <alessandro.portale@nokia.com>
---
src/plugins/remotelinux/deployablefilesperprofile.cpp | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/src/plugins/remotelinux/deployablefilesperprofile.cpp b/src/plugins/remotelinux/deployablefilesperprofile.cpp
index fbe0d68e605..b9d618b6c3e 100644
--- a/src/plugins/remotelinux/deployablefilesperprofile.cpp
+++ b/src/plugins/remotelinux/deployablefilesperprofile.cpp
@@ -91,11 +91,8 @@ DeployableFilesPerProFile::DeployableFilesPerProFile(const Qt4ProFileNode *proFi
d->deployables << DeployableFile(file, elem.path);
}
- for (int i = 0; i < d->deployables.count(); ++i) {
- QString &remoteDir = d->deployables[i].remoteDir;
- if (QFileInfo(remoteDir).isRelative())
- remoteDir.prepend(installPrefix + QLatin1Char('/'));
- }
+ for (int i = 0; i < d->deployables.count(); ++i)
+ d->deployables[i].remoteDir.prepend(installPrefix + QLatin1Char('/'));
}
DeployableFilesPerProFile::~DeployableFilesPerProFile()
--
GitLab