From 8531ff383ba8b9f43da0119f5e9761dd2d98a006 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Fri, 11 Oct 2013 14:41:30 +0200 Subject: 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 --- src/libs/installer/packagemanagercoredata.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 -- cgit v1.2.3