From cf43cc439170117f64b2d3ee6822bc48e72f9ade Mon Sep 17 00:00:00 2001
From: Aurindam Jana <aurindam.jana@nokia.com>
Date: Thu, 29 Mar 2012 11:03:54 +0200
Subject: [PATCH] QmlCppEngine: Return engine capabilities of current engine
Change-Id: If006ecaf09314c00822a70f790a69eb73edc2d28
Reviewed-by: hjk <qthjk@ovi.com>
---
src/plugins/debugger/qml/qmlcppengine.cpp | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/src/plugins/debugger/qml/qmlcppengine.cpp b/src/plugins/debugger/qml/qmlcppengine.cpp
index d2115b9c455..58f570c9f98 100644
--- a/src/plugins/debugger/qml/qmlcppengine.cpp
+++ b/src/plugins/debugger/qml/qmlcppengine.cpp
@@ -216,9 +216,14 @@ bool QmlCppEngine::hasCapability(unsigned cap) const
// ### this could also be an OR of both engines' capabilities
bool hasCap = d->m_cppEngine->hasCapability(cap);
if (d->m_activeEngine != d->m_cppEngine) {
+ //Some capabilities cannot be handled by QML Engine
+ //Expand this list as and when required
if (cap == AddWatcherWhileRunningCapability)
hasCap = hasCap || d->m_qmlEngine->hasCapability(cap);
- if (cap == WatchWidgetsCapability)
+ if (cap == WatchWidgetsCapability ||
+ cap == DisassemblerCapability ||
+ cap == OperateByInstructionCapability ||
+ cap == ReverseSteppingCapability)
hasCap = hasCap && d->m_qmlEngine->hasCapability(cap);
}
return hasCap;
--
GitLab