diff options
| author | Katja Marttila <katja.marttila@qt.io> | 2021-01-21 09:01:58 +0200 |
|---|---|---|
| committer | Katja Marttila <katja.marttila@qt.io> | 2021-02-03 22:17:42 +0200 |
| commit | 3acc4e966025ea174fd873c4f29f76b6dfed9b4b (patch) | |
| tree | e6ec29af9e81551ee476cb18ec19aad2808b3324 /src/libs/installer/packagemanagercore_p.cpp | |
| parent | 9792033524025e433e5537c4d9bc26531f6ae679 (diff) | |
Save Execute operation with predefined variable
When operations are saved to dat file, the variables
are resolved making it impossible to change it afterwards. This change
allows saving the Execute -operation variables unresolved. Variables
are resolved runtime so those can be changed using e.g. script.
Task-number: QTIFW-2124
Change-Id: I22a0502a5760234fc331aa931b8c66864e855e34
Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
Diffstat (limited to 'src/libs/installer/packagemanagercore_p.cpp')
| -rw-r--r-- | src/libs/installer/packagemanagercore_p.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp index e3dfe7f4f..7f4330ca8 100644 --- a/src/libs/installer/packagemanagercore_p.cpp +++ b/src/libs/installer/packagemanagercore_p.cpp @@ -1,6 +1,6 @@ /************************************************************************** ** -** Copyright (C) 2020 The Qt Company Ltd. +** Copyright (C) 2021 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of the Qt Installer Framework. @@ -101,8 +101,11 @@ public: return; qCDebug(QInstaller::lcInstallerInstallLog).noquote() << QString::fromLatin1("%1 %2 operation: %3") .arg(state, m_operation->value(QLatin1String("component")).toString(), m_operation->name()); + QStringList args = m_operation->arguments(); + if (m_operation->requiresUnreplacedVariables()) + args = m_operation->packageManager()->replaceVariables(m_operation->arguments()); qCDebug(QInstaller::lcInstallerInstallLog).noquote() << QString::fromLatin1("\t- arguments: %1") - .arg(m_operation->arguments().join(QLatin1String(", "))); + .arg(args.join(QLatin1String(", "))); } ~OperationTracer() { if (!m_operation) |