diff --git a/src/plugins/debugger/qml/qmlcppengine.cpp b/src/plugins/debugger/qml/qmlcppengine.cpp
index 8d69249b688..890789fe869 100644
--- a/src/plugins/debugger/qml/qmlcppengine.cpp
+++ b/src/plugins/debugger/qml/qmlcppengine.cpp
@@ -40,6 +40,9 @@
 
 #include <coreplugin/icore.h>
 #include <utils/qtcassert.h>
+#include <texteditor/itexteditor.h>
+#include <qmljseditor/qmljseditorconstants.h>
+#include <cppeditor/cppeditorconstants.h>
 
 #include <QTimer>
 #include <QMainWindow>
@@ -127,11 +130,20 @@ QmlCppEngine::~QmlCppEngine()
     delete d;
 }
 
+bool QmlCppEngine::canDisplayTooltip() const
+{
+    return d->m_cppEngine->canDisplayTooltip() || d->m_qmlEngine->canDisplayTooltip();
+}
+
 bool QmlCppEngine::setToolTipExpression(const QPoint & mousePos,
         TextEditor::ITextEditor *editor, const DebuggerToolTipContext &ctx)
 {
-    //FIXIT:: This is broken!!
-    return d->m_activeEngine->setToolTipExpression(mousePos, editor, ctx);
+    bool success = false;
+    if (editor->id() == CppEditor::Constants::CPPEDITOR_ID)
+        success = d->m_cppEngine->setToolTipExpression(mousePos, editor, ctx);
+    else if (editor->id() == QmlJSEditor::Constants::C_QMLJSEDITOR_ID)
+        success = d->m_qmlEngine->setToolTipExpression(mousePos, editor, ctx);
+    return success;
 }
 
 void QmlCppEngine::updateWatchData(const WatchData &data,
diff --git a/src/plugins/debugger/qml/qmlcppengine.h b/src/plugins/debugger/qml/qmlcppengine.h
index efddd12f850..7d3483ed0ab 100644
--- a/src/plugins/debugger/qml/qmlcppengine.h
+++ b/src/plugins/debugger/qml/qmlcppengine.h
@@ -50,6 +50,7 @@ public:
                           QString *errorMessage);
     ~QmlCppEngine();
 
+    bool canDisplayTooltip() const;
     bool setToolTipExpression(const QPoint &mousePos,
         TextEditor::ITextEditor * editor, const DebuggerToolTipContext &);
     void updateWatchData(const WatchData &data,