diff options
| author | Christian Kandeler <christian.kandeler@digia.com> | 2013-06-27 10:57:33 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@digia.com> | 2013-06-28 10:41:14 +0200 |
| commit | 5ad24ce6f80cc0a8712e8133e863dc4ede0f42ab (patch) | |
| tree | 498cf132942e9fbd4715570377bec920af34524d /src/lib/buildgraph | |
| parent | f8ba241241af93cdf3c7ac58106c7377a637d8b2 (diff) | |
| download | qbs-5ad24ce6f80cc0a8712e8133e863dc4ede0f42ab.tar.gz | |
Re-introduce property qbs.installPrefix.
This property used to exist and was erroneously removed when the
"install root" parameter was introduced. The author has now learned that
"install prefix" and "install root" are actually orthogonal concepts.
Change-Id: I8f704c92d09817063b82a175693899af9adc9bac
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'src/lib/buildgraph')
| -rw-r--r-- | src/lib/buildgraph/productinstaller.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/lib/buildgraph/productinstaller.cpp b/src/lib/buildgraph/productinstaller.cpp index 468f79f9d..bd48c2364 100644 --- a/src/lib/buildgraph/productinstaller.cpp +++ b/src/lib/buildgraph/productinstaller.cpp @@ -121,8 +121,11 @@ void ProductInstaller::copyFile(const Artifact *artifact) } const QString relativeInstallDir = artifact->properties->qbsPropertyValue(QLatin1String("installDir")).toString(); + const QString installPrefix + = artifact->properties->qbsPropertyValue(QLatin1String("installPrefix")).toString(); QString targetDir = m_options.installRoot(); - targetDir.append(QLatin1Char('/')).append(relativeInstallDir); + targetDir.append(QLatin1Char('/')).append(installPrefix) + .append(QLatin1Char('/')).append(relativeInstallDir); targetDir = QDir::cleanPath(targetDir); const QString nativeFilePath = QDir::toNativeSeparators(artifact->filePath()); const QString nativeTargetDir = QDir::toNativeSeparators(targetDir); |