diff options
| author | Katja Marttila <katja.marttila@qt.io> | 2021-02-10 13:42:52 +0200 |
|---|---|---|
| committer | Katja Marttila <katja.marttila@qt.io> | 2021-02-16 12:45:37 +0200 |
| commit | 5b55a71adb283d8e335cd724c2b7b66acf3551a5 (patch) | |
| tree | e9015e6f570a0269201fbdf2c8427cd2b18cd11a /src/libs/installer/packagemanagercore_p.cpp | |
| parent | a590f1620af4906accd0d126e2b7da46c482e90a (diff) | |
Fix value overwrite from command line
Key-value pairs given from command line should overwrite all common
variables and custom variables saved to maintenancetool.ini
Task-number: QTIFW-2021
Change-Id: I1abd8b67e6ae76051a2887965099e00344bc5cc0
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 | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/libs/installer/packagemanagercore_p.cpp b/src/libs/installer/packagemanagercore_p.cpp index 924de0de3..fea032ab1 100644 --- a/src/libs/installer/packagemanagercore_p.cpp +++ b/src/libs/installer/packagemanagercore_p.cpp @@ -624,6 +624,9 @@ void PackageManagerCorePrivate::initialize(const QHash<QString, QString> ¶ms #else readMaintenanceConfigFiles(QCoreApplication::applicationDirPath()); #endif + // Maintenancetool might have overwritten the variables + // user has given from command line. Reset those variables. + m_data.setUserDefinedVariables(params); } processFilesForDelayedDeletion(); |