diff options
author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2011-06-09 16:22:45 +1000 |
---|---|---|
committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2011-06-09 16:22:45 +1000 |
commit | 250763ffb5cef2173b80b0e67266c937850ff516 (patch) | |
tree | 1de5e73b20a714c2cd32565873e6f3712a699c0d /src/declarative/qml/qdeclarativeexpression.h | |
parent | 8bb487e60899382f0890fd675eb272d5cc562882 (diff) | |
parent | 2d16155bb8fef642ce6bb5cab7cb26b1289a1e6b (diff) |
Merge branch 'qtquick2' into v8
Conflicts:
src/declarative/qml/qml.pri
Diffstat (limited to 'src/declarative/qml/qdeclarativeexpression.h')
-rw-r--r-- | src/declarative/qml/qdeclarativeexpression.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/declarative/qml/qdeclarativeexpression.h b/src/declarative/qml/qdeclarativeexpression.h index de2042e58c..217545e08e 100644 --- a/src/declarative/qml/qdeclarativeexpression.h +++ b/src/declarative/qml/qdeclarativeexpression.h @@ -43,6 +43,7 @@ #define QDECLARATIVEEXPRESSION_H #include <QtDeclarative/qdeclarativeerror.h> +#include <QtDeclarative/qdeclarativescriptstring.h> #include <QtCore/qobject.h> #include <QtCore/qvariant.h> @@ -65,6 +66,7 @@ class Q_DECLARATIVE_EXPORT QDeclarativeExpression : public QObject public: QDeclarativeExpression(); QDeclarativeExpression(QDeclarativeContext *, QObject *, const QString &, QObject * = 0); + explicit QDeclarativeExpression(const QDeclarativeScriptString &, QObject * = 0); virtual ~QDeclarativeExpression(); QDeclarativeEngine *engine() const; |