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

debugger: replace static capability check by something potentially dynamic

Browse Source 
This does not yet use the potential.

Change-Id: I087311fb7d59b46e49f65a84c4420c72a1227ebb
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>
This commit is contained in:
hjk
2012-01-12 20:28:17 +01:00
committed by hjk
parent 1c1b3840c5
commit 496e9fafd0
23 changed files with 86 additions and 111 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -250,18 +250,18 @@ void QmlCppEngine::setRegisterValue(int regnr, const QString &value)
d->m_cppEngine->setRegisterValue(regnr, value);
}
unsigned QmlCppEngine::debuggerCapabilities() const
bool QmlCppEngine::hasCapability(unsigned cap) const
{
// ### this could also be an OR of both engines' capabilities
unsigned result = d->m_cppEngine->debuggerCapabilities();
bool hasCap = d->m_cppEngine->hasCapability(cap);
if (d->m_activeEngine != d->m_cppEngine) {
const unsigned qmlCapabilities = d->m_qmlEngine->debuggerCapabilities();
if (qmlCapabilities & AddWatcherWhileRunningCapability)
result |= AddWatcherWhileRunningCapability;
if (!(qmlCapabilities & WatchWidgetsCapability))
result &= ~WatchWidgetsCapability;
if (cap == AddWatcherWhileRunningCapability)
hasCap = hasCap || d->m_qmlEngine->hasCapability(cap);
if (cap == WatchWidgetsCapability)
hasCap = hasCap && d->m_qmlEngine->hasCapability(cap);
}
return result;
return hasCap;
}
bool QmlCppEngine::isSynchronous() const