diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-04-16 03:26:42 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-04-16 03:26:42 (GMT) |
| commit | ab93420dfd9ebcde01e1aecc0729133803014719 (patch) | |
| tree | 9cac66e348617292ee878fd4f2f3a5f6f1e2a706 /src/declarative/qml/qdeclarativeengine_p.h | |
| parent | 575f0064bd91e26daa75805c142c10a04a32c2fd (diff) | |
| parent | de435ffb63c39bc44045ab4e96282c1bc1836feb (diff) | |
| download | Qt-ab93420dfd9ebcde01e1aecc0729133803014719.zip Qt-ab93420dfd9ebcde01e1aecc0729133803014719.tar.gz Qt-ab93420dfd9ebcde01e1aecc0729133803014719.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml into 4.7
Diffstat (limited to 'src/declarative/qml/qdeclarativeengine_p.h')
| -rw-r--r-- | src/declarative/qml/qdeclarativeengine_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/declarative/qml/qdeclarativeengine_p.h b/src/declarative/qml/qdeclarativeengine_p.h index b3bba43..43d329c 100644 --- a/src/declarative/qml/qdeclarativeengine_p.h +++ b/src/declarative/qml/qdeclarativeengine_p.h @@ -311,7 +311,7 @@ public: QScriptValue scriptValueFromVariant(const QVariant &); QVariant scriptValueToVariant(const QScriptValue &, int hint = QVariant::Invalid); - void sendQuit (); + void sendQuit(); static QScriptValue qmlScriptObject(QObject*, QDeclarativeEngine*); |