diff options
| author | Kai Koehne <kai.koehne@digia.com> | 2013-10-11 14:41:30 +0200 |
|---|---|---|
| committer | Kai Koehne <kai.koehne@digia.com> | 2013-10-11 16:44:56 +0200 |
| commit | 8531ff383ba8b9f43da0119f5e9761dd2d98a006 (patch) | |
| tree | b4429a6d05e019a8024d4d029ed889b5865a89db /src/libs/installer/packagemanagercoredata.cpp | |
| parent | c8de51cadbc5855ca1e77d038d7f09bf60d059ee (diff) | |
Fix target dir for root installations and empty AdminTargetDir
Make sure e.g. '@homeDir@' is replaced also in this case.
Change-Id: Ife5b2d88e19abdab8b9264c5db09c1d9b5c13916
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Diffstat (limited to 'src/libs/installer/packagemanagercoredata.cpp')
| -rw-r--r-- | src/libs/installer/packagemanagercoredata.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libs/installer/packagemanagercoredata.cpp b/src/libs/installer/packagemanagercoredata.cpp index 2294a8086..65123efba 100644 --- a/src/libs/installer/packagemanagercoredata.cpp +++ b/src/libs/installer/packagemanagercoredata.cpp @@ -138,7 +138,7 @@ QVariant PackageManagerCoreData::value(const QString &key, const QVariant &_defa if (key == scTargetDir) { QString dir = m_variables.value(key); if (dir.isEmpty()) - dir = m_settings.value(key, _default).toString(); + dir = replaceVariables(m_settings.value(key, _default).toString()); #ifdef Q_OS_WIN return QInstaller::normalizePathName(dir); #else |