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

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

Change-Id: I88cf580f58ef44a85131cd53410b374c24996daf

2 files changed, 8 insertions, 4 deletions

diff --git a/README b/README
index 1e4971e29..d9c9be7d4 100644
--- a/README
+++ b/README
@@ -1,6 +1,3 @@
-Qt Installer Framework
-==========================
-
 The Qt Installer Framework provides a set of tools and utilities to create
 installers for the supported desktop Qt platforms: Linux, Microsoft Windows, and
 Mac OS X.
@@ -13,6 +10,13 @@ The binary packages for the Qt Installer Framework include documentation in the
 doc directory. See http://qt-project.org/wiki/Qt-Installer-Framework for a link
 to online versions.
 
+Notes
+--------------------------
+- To build an installer, it is advised to use a statically linked Qt. See the
+  documentation at
+  http://doc-snapshot.qt-project.org/qtifw-master/ifw-getting-started.html
+- At the moment, only building with Qt 4.8.x is supported.
+
 
 Getting Help
 --------------------------
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;
     }