QmlDesigner: Fix help

The designer used a over simplified lookup,
that did not distinguish between e.g. Controls 1 and Controls 2.
Instead of fixing the lookup we simply use the working lookup from
the QmlJSEditor.

Change-Id: I2d31e633eaadc67e211d44bad307b26993f21fc9
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>

1 files changed, 8 insertions, 15 deletions

diff --git a/src/plugins/qmldesigner/designercore/model/abstractview.cpp b/src/plugins/qmldesigner/designercore/model/abstractview.cpp
index c6084a9c93..7579c12503 100644
--- a/src/plugins/qmldesigner/designercore/model/abstractview.cpp
+++ b/src/plugins/qmldesigner/designercore/model/abstractview.cpp
@@ -31,6 +31,11 @@
 #include "nodeinstanceview.h"
 #include <qmlstate.h>
 
+#ifndef QMLDESIGNER_TEST
+#include <qmldesignerplugin.h>
+#include <viewmanager.h>
+#endif
+
 #include <coreplugin/helpmanager.h>
 #include <utils/qtcassert.h>
 
@@ -554,21 +559,9 @@ QString AbstractView::contextHelpId() const
 {
     QString helpId;
 
-    if (hasSelectedModelNodes()) {
-        QString className = firstSelectedModelNode().simplifiedTypeName();
-        helpId = QStringLiteral("QML.") + className;
-        if (Core::HelpManager::linksForIdentifier(helpId).isEmpty() && firstSelectedModelNode().metaInfo().isValid()) {
-
-            foreach (className, firstSelectedModelNode().metaInfo().superClassNames()) {
-                helpId = QStringLiteral("QML.") + className;
-                if (Core::HelpManager::linksForIdentifier(helpId).isEmpty())
-                    helpId = QString();
-                else
-                    break;
-            }
-        }
-    }
-
+#ifndef QMLDESIGNER_TEST
+    helpId = QmlDesignerPlugin::instance()->viewManager().qmlJSEditorHelpId();
+#endif
     return helpId;
 }