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

QmlObserver: breakpoint list is shared between engines

Browse Source 
Reviewed by:  Kai Koehne, Andre Poenitz
This commit is contained in:
Christiaan Janssen
2010-10-05 11:01:14 +02:00
parent 9dfc5b1414
commit 24912c3f2e
10 changed files with 92 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -222,6 +222,11 @@ void QmlCppEngine::attemptBreakpointSynchronization()
static_cast<DebuggerEngine*>(d->m_qmlEngine)->attemptBreakpointSynchronization();
}
bool QmlCppEngine::acceptsBreakpoint(const Internal::BreakpointData *br)
{
return d->m_cppEngine->acceptsBreakpoint(br) || d->m_qmlEngine->acceptsBreakpoint(br);
}
void QmlCppEngine::selectThread(int index)
{
d->m_cppEngine->selectThread(index);

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

@@ -52,6 +52,7 @@ public:
virtual void updateAll();
virtual void attemptBreakpointSynchronization();
virtual bool acceptsBreakpoint(const Internal::BreakpointData *br);
virtual void selectThread(int index);
virtual void assignValueInDebugger(const Internal::WatchData *w, const QString &expr, const QVariant &value);

5
src/plugins/debugger/qml/qmlengine.cpp
View File

@@ -460,6 +460,11 @@ void QmlEngine::attemptBreakpointSynchronization()
}
}
bool QmlEngine::acceptsBreakpoint(const Internal::BreakpointData *br)
{
return (br->fileName.endsWith(QLatin1String("qml")) || br->fileName.endsWith(QLatin1String("js")));
}
void QmlEngine::loadSymbols(const QString &moduleName)
{
Q_UNUSED(moduleName)

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

@@ -93,6 +93,7 @@ private:
void selectThread(int index);
void attemptBreakpointSynchronization();
bool acceptsBreakpoint(const Internal::BreakpointData *br);
void assignValueInDebugger(const Internal::WatchData *w, const QString &expr, const QVariant &value);
void loadSymbols(const QString &moduleName);