feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlCppDebugger: Fix tool tip expression

Browse Source 
Change-Id: I1dd81d87c744b4a7f8bd86ac08d95bc5e63bd17f
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>
This commit is contained in:
Aurindam Jana
2012-03-30 15:30:46 +02:00
parent 6c49480040
commit 3781a17700
2 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/plugins/debugger/qml/qmlcppengine.cpp
View File

@@ -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,

1
src/plugins/debugger/qml/qmlcppengine.h
View File

@@ -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,