Make installSourceBase work with absolute paths.

This also fixes the error message, as a side effect.

Change-Id: I2af7369ff2e9716d760d5a024970f1808dcf2de4
Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/src/lib/corelib/buildgraph/productinstaller.cpp b/src/lib/corelib/buildgraph/productinstaller.cpp
index cbe5327c8..584ff28bb 100644
--- a/src/lib/corelib/buildgraph/productinstaller.cpp
+++ b/src/lib/corelib/buildgraph/productinstaller.cpp
@@ -121,13 +121,13 @@ QString ProductInstaller::targetFilePath(const TopLevelProject *project,
         // This has the same effect as if installSourceBase would equal the directory of the file.
         targetFilePath = FileInfo::fileName(sourceFilePath);
     } else {
-        const QString localAbsBasePath = QDir::cleanPath(productSourceDir + QLatin1Char('/')
-                                                         + installSourceBase);
+        const QString localAbsBasePath = FileInfo::resolvePath(QDir::cleanPath(productSourceDir),
+                                                               QDir::cleanPath(installSourceBase));
         targetFilePath = sourceFilePath;
         if (!targetFilePath.startsWith(localAbsBasePath)) {
             throw ErrorInfo(Tr::tr("Cannot install '%1', because it doesn't start with the"
                                    " value of qbs.installSourceBase '%2'.").arg(sourceFilePath,
-                                                                                installSourceBase));
+                                                                                localAbsBasePath));
         }
 
         targetFilePath.remove(0, localAbsBasePath.length() + 1);