diff options
| author | Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> | 2010-03-22 03:28:38 (GMT) |
|---|---|---|
| committer | Dmytro Poplavskiy <dmytro.poplavskiy@nokia.com> | 2010-03-22 03:28:38 (GMT) |
| commit | 0dff17f1e08f57040f3a156f9f3675024ec59978 (patch) | |
| tree | 0b3c47a172b90acfd3582b7f6d04bb9b8d9ff780 /src/declarative/qml/qdeclarativeexpression.h | |
| parent | 1ef014ebae2c28c38c25facd90ba8be71b195195 (diff) | |
| parent | dbd293e2579e80756ca7e711ea1f82b9e42c5b92 (diff) | |
| download | Qt-0dff17f1e08f57040f3a156f9f3675024ec59978.zip Qt-0dff17f1e08f57040f3a156f9f3675024ec59978.tar.gz Qt-0dff17f1e08f57040f3a156f9f3675024ec59978.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7
Diffstat (limited to 'src/declarative/qml/qdeclarativeexpression.h')
| -rw-r--r-- | src/declarative/qml/qdeclarativeexpression.h | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/src/declarative/qml/qdeclarativeexpression.h b/src/declarative/qml/qdeclarativeexpression.h index 911d328..73a5793 100644 --- a/src/declarative/qml/qdeclarativeexpression.h +++ b/src/declarative/qml/qdeclarativeexpression.h @@ -58,6 +58,7 @@ class QDeclarativeRefCount; class QDeclarativeEngine; class QDeclarativeContext; class QDeclarativeExpressionPrivate; +class QDeclarativeContextData; class Q_DECLARATIVE_EXPORT QDeclarativeExpression : public QObject { Q_OBJECT @@ -91,18 +92,21 @@ Q_SIGNALS: void valueChanged(); protected: - QDeclarativeExpression(QDeclarativeContext *, const QString &, QObject *, - QDeclarativeExpressionPrivate &dd); - QDeclarativeExpression(QDeclarativeContext *, void *, QDeclarativeRefCount *rc, QObject *me, const QString &, - int, QDeclarativeExpressionPrivate &dd); + QDeclarativeExpression(QDeclarativeContextData *, const QString &, QObject *, + QDeclarativeExpressionPrivate &dd); + QDeclarativeExpression(QDeclarativeContextData *, void *, QDeclarativeRefCount *rc, + QObject *me, const QString &, int, QDeclarativeExpressionPrivate &dd); private Q_SLOTS: void __q_notify(); private: + QDeclarativeExpression(QDeclarativeContextData *, const QString &, QObject *); + Q_DECLARE_PRIVATE(QDeclarativeExpression) friend class QDeclarativeDebugger; friend class QDeclarativeContext; + friend class QDeclarativeVME; }; QT_END_NAMESPACE |