From bc15c2d4b68d77adf8929417311b36ad217d773f Mon Sep 17 00:00:00 2001
From: Andreas Holzammer <andreas.holzammer.qnx@kdab.com>
Date: Mon, 8 Oct 2012 16:27:10 +0200
Subject: Fix error message CopyDirectoryOperation overwrite

Error string did not match the actual expected
parameters. Also respect column count.

Change-Id: I3978d597697517ef4164d67f8d195f988e70f1d9
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
---
 src/libs/installer/copydirectoryoperation.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

(limited to 'src/libs/installer')

diff --git a/src/libs/installer/copydirectoryoperation.cpp b/src/libs/installer/copydirectoryoperation.cpp
index dabc7fa62..f10b077a8 100644
--- a/src/libs/installer/copydirectoryoperation.cpp
+++ b/src/libs/installer/copydirectoryoperation.cpp
@@ -67,7 +67,8 @@ bool CopyDirectoryOperation::performOperation()
     const QStringList args = arguments();
     if (args.count() < 2 || args.count() > 3) {
         setError(InvalidArguments);
-        setErrorString(tr("Invalid arguments in %0: %1 arguments given, expected: <source> <target> [overwrite]").arg(name())
+        setErrorString(tr("Invalid arguments in %0: %1 arguments given, expected: <source> <target>"
+                          "[forceOverwrite]").arg(name())
             .arg(args.count()));
         return false;
     }
@@ -81,7 +82,8 @@ bool CopyDirectoryOperation::performOperation()
             overwrite = true;
         } else {
             setError(InvalidArguments);
-            setErrorString(tr("Invalid argument in %0: Third argument needs to be forceOverwrite, if specified").arg(name()));
+            setErrorString(tr("Invalid argument in %0: Third argument needs to be forceOverwrite, "
+                              "if specified").arg(name()));
             return false;
         }
     }
-- 
cgit v1.2.3