Merge remote-tracking branch 'origin/2.6'

Conflicts:
	src/plugins/cpptools/cppcompletion_test.cpp
	src/plugins/projectexplorer/kitmanagerconfigwidget.cpp
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp
	src/plugins/qtsupport/baseqtversion.cpp
	tests/auto/cplusplus/findusages/tst_findusages.cpp

Change-Id: Idd2abc09753a71a6c252bfa9914274459b2c7e63

1 files changed, 12 insertions, 10 deletions

diff --git a/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp b/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp
index dee239ba23..c7f372d39e 100644
--- a/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp
+++ b/src/plugins/qmldesigner/designercore/instances/nodeinstanceserverproxy.cpp
@@ -210,21 +210,23 @@ NodeInstanceServerProxy::NodeInstanceServerProxy(NodeInstanceView *nodeInstanceV
            }
 
        } else {
-           QMessageBox::warning(0, tr("Cannot Start QML Puppet Executable"),
-                                tr("The executable of the QML Puppet process (%1) cannot be started. "
-                                   "Please check your installation. "
-                                   "QML Puppet is a process which runs in the background to render the items.").
-                                arg(applicationPath));
+           if (!hasQtQuick2(m_nodeInstanceView.data()))
+               QMessageBox::warning(0, tr("Cannot Start QML Puppet Executable"),
+                                    tr("The executable of the QML Puppet process (%1) cannot be started. "
+                                       "Please check your installation. "
+                                       "QML Puppet is a process which runs in the background to render the items.").
+                                    arg(applicationPath));
        }
 
        m_localServer->close();
 
    } else {
-       QMessageBox::warning(0, tr("Cannot Find QML Puppet Executable"),
-                            tr("The executable of the QML Puppet process (%1) cannot be found. "
-                               "Please check your installation. "
-                               "QML Puppet is a process which runs in the background to render the items.").
-                            arg(applicationPath));
+       if (!hasQtQuick2(m_nodeInstanceView.data()))
+           QMessageBox::warning(0, tr("Cannot Find QML Puppet Executable"),
+                                tr("The executable of the QML Puppet process (%1) cannot be found. "
+                                   "Please check your installation. "
+                                   "QML Puppet is a process which runs in the background to render the items.").
+                                arg(applicationPath));
    }
 }