Allow disabling undo in CopyDirectory during uninstall

Task-number: QTIFW-2088
Change-Id: Ic5e781b89b1c74fc8f65575bd46c073610545523
Reviewed-by: Arttu Tarkiainen <arttu.tarkiainen@qt.io>

1 files changed, 6 insertions, 2 deletions

diff --git a/src/libs/installer/copydirectoryoperation.cpp b/src/libs/installer/copydirectoryoperation.cpp
index 4cef3facf..a2ef2cf5a 100644
--- a/src/libs/installer/copydirectoryoperation.cpp
+++ b/src/libs/installer/copydirectoryoperation.cpp
@@ -67,7 +67,7 @@ bool CopyDirectoryOperation::performOperation()
     if (!checkArgumentCount(2, 3, tr("<source> <target> [\"forceOverwrite\"]")))
         return false;
 
-    const QStringList args = arguments();
+    const QStringList args = parsePerformOperationArguments();
     const QString sourcePath = args.at(0);
     const QString targetPath = args.at(1);
     bool overwrite = false;
@@ -153,7 +153,11 @@ bool CopyDirectoryOperation::performOperation()
 
 bool CopyDirectoryOperation::undoOperation()
 {
-    Q_ASSERT(arguments().count() == 2);
+    if (parseUndoOperationArguments().count() > 0)
+        return true;
+
+    if (!checkArgumentCount(2))
+        return false;
 
     QDir dir;
     const QStringList files = value(QLatin1String("files")).toStringList();