diff options
| author | Eike Ziller <eike.ziller@digia.com> | 2014-03-05 15:58:12 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2014-03-05 16:27:52 +0100 |
| commit | 5dd8d7cd9c04909df1644ba415c578db1e157ba1 (patch) | |
| tree | b7db95ce4bf2ff2b91a7ef566a1e2935a6dd7ba4 /src/plugins/debugger/qml/qmlcppengine.cpp | |
| parent | 424a5c14897ecdaaa12f038dc6e11836b764f516 (diff) | |
| download | qt-creator-5dd8d7cd9c04909df1644ba415c578db1e157ba1.tar.gz | |
Editors: Move id() from editor to document.
Change-Id: Ib81076842ab1c16832224790194b001206404d64
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Diffstat (limited to 'src/plugins/debugger/qml/qmlcppengine.cpp')
| -rw-r--r-- | src/plugins/debugger/qml/qmlcppengine.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/debugger/qml/qmlcppengine.cpp b/src/plugins/debugger/qml/qmlcppengine.cpp index 61090b940f..997c5eea60 100644 --- a/src/plugins/debugger/qml/qmlcppengine.cpp +++ b/src/plugins/debugger/qml/qmlcppengine.cpp @@ -111,10 +111,11 @@ bool QmlCppEngine::canDisplayTooltip() const bool QmlCppEngine::setToolTipExpression(const QPoint & mousePos, TextEditor::ITextEditor *editor, const DebuggerToolTipContext &ctx) { + QTC_ASSERT(editor, return false); bool success = false; - if (editor->id() == CppEditor::Constants::CPPEDITOR_ID) + if (editor->document()->id() == CppEditor::Constants::CPPEDITOR_ID) success = d->m_cppEngine->setToolTipExpression(mousePos, editor, ctx); - else if (editor->id() == QmlJSEditor::Constants::C_QMLJSEDITOR_ID) + else if (editor->document()->id() == QmlJSEditor::Constants::C_QMLJSEDITOR_ID) success = d->m_qmlEngine->setToolTipExpression(mousePos, editor, ctx); return success; } |