diff options
author | Niels Weber <niels.weber@digia.com> | 2014-11-06 14:55:31 +0100 |
---|---|---|
committer | Niels Weber <niels.weber@digia.com> | 2014-11-06 16:36:15 +0100 |
commit | 4fb18d6b48950bf192e0001b9a99196b623c92e5 (patch) | |
tree | 189043ce419f45a1c998fbd5cbeaa1c57935626f /src/libs/installer/packagemanagercoredata.cpp | |
parent | 0a309c498e9320798673e6451d5f05ff26be4713 (diff) |
Don't replace scRunProgram and scRunProgramArguments at the start
We always tried to replace them in the correct place (when clicking
finished) anyway. That didn't work as the values were already
replaced in the beginning. This could lead to errors when for
example @TargetDir@ was used as a value and the user selected a
different directory.
Task-number: QTIFW-397
Change-Id: I5b5214bdee12f4d8ae6c239a16531e9d722494a0
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>
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, 0 insertions, 2 deletions
diff --git a/src/libs/installer/packagemanagercoredata.cpp b/src/libs/installer/packagemanagercoredata.cpp index 034613863..d8b6d3a28 100644 --- a/src/libs/installer/packagemanagercoredata.cpp +++ b/src/libs/installer/packagemanagercoredata.cpp @@ -123,8 +123,6 @@ PackageManagerCoreData::PackageManagerCoreData(const QHash<QString, QString> &va m_variables.insert(scRunProgramDescription, description); m_variables.insert(scTargetDir, replaceVariables(m_settings.targetDir())); - m_variables.insert(scRunProgram, replaceVariables(m_settings.runProgram())); - m_variables.insert(scRunProgramArguments, replaceVariables(m_settings.runProgramArguments())); m_variables.insert(scRemoveTargetDir, replaceVariables(m_settings.removeTargetDir())); } |