Merge branch '2.3'

Conflicts:
	src/plugins/debugger/qml/qmlengine.cpp

Change-Id: I46509f0c187b71bbaed7b2118a160914f8250ca4

src/plugins/remotelinux/publickeydeploymentdialog.cpp

@@ -33,6 +33,7 @@
 #include "linuxdeviceconfiguration.h"
 #include "sshkeydeployer.h"
 
+#include <QtCore/QTimer>
 #include <QtGui/QFileDialog>
 
 namespace RemoteLinux {
@@ -66,7 +67,7 @@ PublicKeyDeploymentDialog::PublicKeyDeploymentDialog(const LinuxDeviceConfigurat
         tr("Choose Public Key File"), dir,
         tr("Public Key Files (*.pub);;All Files (*)"));
     if (publicKeyFileName.isEmpty()) {
-        reject();
+        QTimer::singleShot(0, this, SLOT(reject()));
         return;
     }