diff options
author | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-07-14 06:55:05 (GMT) |
---|---|---|
committer | Paul Olav Tvete <paul.tvete@nokia.com> | 2010-07-14 06:55:05 (GMT) |
commit | 0832d7209e3aee7055fb39339030ff6842f4117d (patch) | |
tree | 75ec174a5492d0ddc52bc2f4dcdef363714a63cb /src/declarative/debugger/qdeclarativedebug_p.h | |
parent | ad0d0c4b6f7958b3cde01855b0f3b9c68db5253a (diff) | |
parent | df28c1203e12c572f795b8d114254a8e5a6619e8 (diff) | |
download | Qt-0832d7209e3aee7055fb39339030ff6842f4117d.zip Qt-0832d7209e3aee7055fb39339030ff6842f4117d.tar.gz Qt-0832d7209e3aee7055fb39339030ff6842f4117d.tar.bz2 |
Merge remote branch 'qt/4.7' into lighthouse-4.7
Conflicts:
src/gui/image/image.pri
src/gui/image/qpixmapdatafactory.cpp
src/gui/painting/qgraphicssystem.cpp
Diffstat (limited to 'src/declarative/debugger/qdeclarativedebug_p.h')
-rw-r--r-- | src/declarative/debugger/qdeclarativedebug_p.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/declarative/debugger/qdeclarativedebug_p.h b/src/declarative/debugger/qdeclarativedebug_p.h index 4ead232..2e79c5d 100644 --- a/src/declarative/debugger/qdeclarativedebug_p.h +++ b/src/declarative/debugger/qdeclarativedebug_p.h @@ -94,6 +94,10 @@ public: QDeclarativeDebugExpressionQuery *queryExpressionResult(int objectDebugId, const QString &expr, QObject *parent = 0); + bool setBindingForObject(int objectDebugId, const QString &propertyName, + const QVariant &bindingExpression, bool isLiteralValue); + bool resetBindingForObject(int objectDebugId, const QString &propertyName); + bool setMethodBody(int objectDebugId, const QString &methodName, const QString &methodBody); private: Q_DECLARE_PRIVATE(QDeclarativeEngineDebug) @@ -348,7 +352,7 @@ class Q_DECLARATIVE_EXPORT QDeclarativeDebugExpressionQuery : public QDeclarativ Q_OBJECT public: virtual ~QDeclarativeDebugExpressionQuery(); - QString expression() const; + QVariant expression() const; QVariant result() const; private: friend class QDeclarativeEngineDebug; @@ -356,7 +360,7 @@ private: QDeclarativeDebugExpressionQuery(QObject *); QDeclarativeEngineDebug *m_client; int m_queryId; - QString m_expr; + QVariant m_expr; QVariant m_result; }; |