diff options
| author | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-05-18 02:30:56 (GMT) |
|---|---|---|
| committer | Aaron Kennedy <aaron.kennedy@nokia.com> | 2010-05-18 02:30:56 (GMT) |
| commit | 4a1a9023622cf712b61e8dc61e30dc26fcb4bf5a (patch) | |
| tree | 872cde40602e6ec1ad831197ee2dcec29ea58443 /tests/auto/declarative/qdeclarativeecmascript | |
| parent | 7d07c1d40056dc2410c00b0e0d45a06c7cda7a6f (diff) | |
| parent | 07fc1c3a97689f1f72e4e9b6d7d1bad1a391a9a7 (diff) | |
| download | Qt-4a1a9023622cf712b61e8dc61e30dc26fcb4bf5a.zip Qt-4a1a9023622cf712b61e8dc61e30dc26fcb4bf5a.tar.gz Qt-4a1a9023622cf712b61e8dc61e30dc26fcb4bf5a.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'tests/auto/declarative/qdeclarativeecmascript')
| -rw-r--r-- | tests/auto/declarative/qdeclarativeecmascript/testtypes.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/declarative/qdeclarativeecmascript/testtypes.h b/tests/auto/declarative/qdeclarativeecmascript/testtypes.h index 1381d57..7bb8a8e 100644 --- a/tests/auto/declarative/qdeclarativeecmascript/testtypes.h +++ b/tests/auto/declarative/qdeclarativeecmascript/testtypes.h @@ -190,7 +190,7 @@ class MyExpression : public QDeclarativeExpression Q_OBJECT public: MyExpression(QDeclarativeContext *ctxt, const QString &expr) - : QDeclarativeExpression(ctxt, expr, 0), changed(false) + : QDeclarativeExpression(ctxt, 0, expr), changed(false) { QObject::connect(this, SIGNAL(valueChanged()), this, SLOT(expressionValueChanged())); setNotifyOnValueChanged(true); |