From 7be83635627ca1384862a8826de2d85979cdfc8e Mon Sep 17 00:00:00 2001
From: Katja Marttila <katja.marttila@qt.io>
Date: Tue, 22 Dec 2020 09:53:36 +0200
Subject: Allow disabling undo of GlobalSettings during uninstall

Task-number: QTIFW-1973
Change-Id: I89f15c8ed7d56c3e1bc72d3c740e9054363f9390
Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>
---
 src/libs/installer/globalsettingsoperation.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'src/libs/installer')

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;
 
-- 
cgit v1.2.3