diff options
author | Katja Marttila <katja.marttila@qt.io> | 2020-12-22 09:53:36 +0200 |
---|---|---|
committer | Katja Marttila <katja.marttila@qt.io> | 2020-12-30 11:10:05 +0200 |
commit | 7be83635627ca1384862a8826de2d85979cdfc8e (patch) | |
tree | 5d25666643ae7de865f73b93ffa80bf3c97d594f /src/libs/installer | |
parent | a606c9915b8ff1d6001a83aa350400d6286706ff (diff) |
Allow disabling undo of GlobalSettings during uninstall
Task-number: QTIFW-1973
Change-Id: I89f15c8ed7d56c3e1bc72d3c740e9054363f9390
Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
Diffstat (limited to 'src/libs/installer')
-rw-r--r-- | src/libs/installer/globalsettingsoperation.cpp | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/libs/installer/globalsettingsoperation.cpp b/src/libs/installer/globalsettingsoperation.cpp index f1f184ceb..dc085f4b6 100644 --- a/src/libs/installer/globalsettingsoperation.cpp +++ b/src/libs/installer/globalsettingsoperation.cpp @@ -49,8 +49,9 @@ void GlobalSettingsOperation::backup() bool GlobalSettingsOperation::performOperation() { + const QStringList args = parsePerformOperationArguments(); QString key, value; - QScopedPointer<QSettingsWrapper> settings(setup(&key, &value, arguments())); + QScopedPointer<QSettingsWrapper> settings(setup(&key, &value, args)); if (settings.isNull()) return false; @@ -76,8 +77,12 @@ bool GlobalSettingsOperation::performOperation() bool GlobalSettingsOperation::undoOperation() { + if (parseUndoOperationArguments().count() > 0) + return true; + + const QStringList args = parsePerformOperationArguments(); QString key, val; - QScopedPointer<QSettingsWrapper> settings(setup(&key, &val, arguments())); + QScopedPointer<QSettingsWrapper> settings(setup(&key, &val, args)); if (settings.isNull()) return false; |