summaryrefslogtreecommitdiffstats
path: root/src/declarative/qml
diff options
context:
space:
mode:
authorAaron Kennedy <aaron.kennedy@nokia.com>2009-05-08 02:22:17 (GMT)
committerAaron Kennedy <aaron.kennedy@nokia.com>2009-05-08 02:22:17 (GMT)
commit242410e288280b9bcf8f3b68fa362be44e4c8813 (patch)
tree789c1acc04f434aa81138705dc8df5f23046ac1a /src/declarative/qml
parentbc20e3e0325f0f3395a6a2012cd263a724576ba1 (diff)
downloadQt-242410e288280b9bcf8f3b68fa362be44e4c8813.zip
Qt-242410e288280b9bcf8f3b68fa362be44e4c8813.tar.gz
Qt-242410e288280b9bcf8f3b68fa362be44e4c8813.tar.bz2
Tweak debugger watches
Diffstat (limited to 'src/declarative/qml')
-rw-r--r--src/declarative/qml/qmlengine.cpp11
-rw-r--r--src/declarative/qml/qmlexpression.h1
2 files changed, 12 insertions, 0 deletions
diff --git a/src/declarative/qml/qmlengine.cpp b/src/declarative/qml/qmlengine.cpp
index 15b5879..50c0981 100644
--- a/src/declarative/qml/qmlengine.cpp
+++ b/src/declarative/qml/qmlengine.cpp
@@ -597,6 +597,9 @@ QNetworkAccessManager *QmlEngine::networkAccessManager() const
*/
QmlContext *QmlEngine::contextForObject(const QObject *object)
{
+ if(!object)
+ return 0;
+
QObjectPrivate *priv = QObjectPrivate::get(const_cast<QObject *>(object));
QmlSimpleDeclarativeData *data =
@@ -1093,6 +1096,14 @@ QObject *QmlExpression::scopeObject() const
}
/*!
+ \internal
+*/
+quint32 QmlExpression::id() const
+{
+ return d->id;
+}
+
+/*!
\class QmlExpression
\brief The QmlExpression class evaluates ECMAScript in a QML context.
*/
diff --git a/src/declarative/qml/qmlexpression.h b/src/declarative/qml/qmlexpression.h
index 0ab5d9c..bb6980a 100644
--- a/src/declarative/qml/qmlexpression.h
+++ b/src/declarative/qml/qmlexpression.h
@@ -80,6 +80,7 @@ public:
QObject *scopeObject() const;
+ quint32 id() const;
protected:
virtual void valueChanged();