diff options
| author | Christian Kandeler <christian.kandeler@qt.io> | 2017-06-01 09:58:20 +0200 |
|---|---|---|
| committer | Christian Kandeler <christian.kandeler@qt.io> | 2017-06-01 08:36:45 +0000 |
| commit | be93f1a65fe3b4314734edd9b95408adaeccdc3e (patch) | |
| tree | 180ab7523e7cff7276e331d8b57a0557a715a0c6 /src/lib/corelib/buildgraph/productinstaller.cpp | |
| parent | 7e04367d71f2b7df5326c6da6d3c1d6e5d28e407 (diff) | |
Initialize qbs.installRoot in the qbs module
...rather than from qbscore. That code was left over from when we didn't
have the property.
Change-Id: Ib796b134ed4145c01ea8992e5788f4a7ff8c5045
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/lib/corelib/buildgraph/productinstaller.cpp')
| -rw-r--r-- | src/lib/corelib/buildgraph/productinstaller.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/lib/corelib/buildgraph/productinstaller.cpp b/src/lib/corelib/buildgraph/productinstaller.cpp index 2b67c0682..1688dcc76 100644 --- a/src/lib/corelib/buildgraph/productinstaller.cpp +++ b/src/lib/corelib/buildgraph/productinstaller.cpp @@ -125,6 +125,8 @@ QString ProductInstaller::targetFilePath(const TopLevelProject *project, = properties->qbsPropertyValue(QLatin1String("installSourceBase")).toString(); initInstallRoot(project, options); QString targetDir = options.installRoot(); + if (targetDir.isEmpty()) + targetDir = properties->qbsPropertyValue(QLatin1String("installRoot")).toString(); targetDir.append(QLatin1Char('/')).append(installPrefix) .append(QLatin1Char('/')).append(relativeInstallDir); targetDir = QDir::cleanPath(targetDir); |