Merge remote-tracking branch 'origin/3.1'

Conflicts:
	src/plugins/cmakeprojectmanager/cmakeopenprojectwizard.cpp

Change-Id: Icce6e8dd9b3afd9a0fe836e9babfb7a17cee9c4d

1 files changed, 16 insertions, 10 deletions

diff --git a/src/plugins/debugger/qml/qmlengine.cpp b/src/plugins/debugger/qml/qmlengine.cpp
index d542bf04d7..17d51e5817 100644
--- a/src/plugins/debugger/qml/qmlengine.cpp
+++ b/src/plugins/debugger/qml/qmlengine.cpp
@@ -457,16 +457,22 @@ void QmlEngine::connectionStartupFailed()
 
 void QmlEngine::appStartupFailed(const QString &errorMessage)
 {
-    QMessageBox *infoBox = new QMessageBox(Core::ICore::mainWindow());
-    infoBox->setIcon(QMessageBox::Critical);
-    infoBox->setWindowTitle(tr("Qt Creator"));
-    infoBox->setText(tr("Could not connect to the in-process QML debugger."
-                        "\n%1").arg(errorMessage));
-    infoBox->setStandardButtons(QMessageBox::Ok | QMessageBox::Help);
-    infoBox->setDefaultButton(QMessageBox::Ok);
-    connect(infoBox, SIGNAL(finished(int)),
-            this, SLOT(errorMessageBoxFinished(int)));
-    infoBox->show();
+    QString error = tr("Could not connect to the in-process QML debugger."
+                       "\n%1").arg(errorMessage);
+
+    if (isMasterEngine()) {
+        QMessageBox *infoBox = new QMessageBox(Core::ICore::mainWindow());
+        infoBox->setIcon(QMessageBox::Critical);
+        infoBox->setWindowTitle(tr("Qt Creator"));
+        infoBox->setText(error);
+        infoBox->setStandardButtons(QMessageBox::Ok | QMessageBox::Help);
+        infoBox->setDefaultButton(QMessageBox::Ok);
+        connect(infoBox, SIGNAL(finished(int)),
+                this, SLOT(errorMessageBoxFinished(int)));
+        infoBox->show();
+    } else {
+        showMessage(error, StatusBar);
+    }
 
     notifyEngineRunFailed();
 }