Merge remote-tracking branch 'origin/1.3' into 1.4

Conflicts:
	README
	src/libs/kdtools/kdupdaterupdateoperations.cpp

Change-Id: I88cf580f58ef44a85131cd53410b374c24996daf

1 files changed, 1 insertions, 1 deletions

diff --git a/src/libs/kdtools/kdupdaterupdateoperations.cpp b/src/libs/kdtools/kdupdaterupdateoperations.cpp
index c6a48bedb..5a4296242 100644
--- a/src/libs/kdtools/kdupdaterupdateoperations.cpp
+++ b/src/libs/kdtools/kdupdaterupdateoperations.cpp
@@ -203,7 +203,7 @@ bool CopyOperation::undoOperation()
 
     QFile destFile(destination);
     // first remove the dest
-    if (!destFile.remove()) {
+    if (destFile.exists() && !destFile.remove()) {
         setError(UserDefinedError, tr("Could not delete file %1: %2").arg(destination, destFile.errorString()));
         return false;
     }