diff options
| author | Warwick Allison <warwick.allison@nokia.com> | 2010-04-16 04:42:29 (GMT) |
|---|---|---|
| committer | Warwick Allison <warwick.allison@nokia.com> | 2010-04-16 04:42:29 (GMT) |
| commit | 373780483dc369eca84157975e26369259f152fd (patch) | |
| tree | 5b4f48fb8a42cc87af3709a411bc117321809863 /src/declarative/qml/qdeclarativeengine.cpp | |
| parent | 348d1f6d421a6e23b769af99608fa6d81631a6c3 (diff) | |
| parent | 8ff39e55286e4ce3f01472fafa06941c9e9537fd (diff) | |
| download | Qt-373780483dc369eca84157975e26369259f152fd.zip Qt-373780483dc369eca84157975e26369259f152fd.tar.gz Qt-373780483dc369eca84157975e26369259f152fd.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.cpp')
| -rw-r--r-- | src/declarative/qml/qdeclarativeengine.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/declarative/qml/qdeclarativeengine.cpp b/src/declarative/qml/qdeclarativeengine.cpp index 8e19240..cfdc79e 100644 --- a/src/declarative/qml/qdeclarativeengine.cpp +++ b/src/declarative/qml/qdeclarativeengine.cpp @@ -1291,7 +1291,7 @@ QScriptValue QDeclarativeEnginePrivate::consoleLog(QScriptContext *ctxt, QScript return e->newVariant(QVariant(true)); } -void QDeclarativeEnginePrivate::sendQuit () +void QDeclarativeEnginePrivate::sendQuit() { Q_Q(QDeclarativeEngine); emit q->quit(); @@ -1300,7 +1300,7 @@ void QDeclarativeEnginePrivate::sendQuit () QScriptValue QDeclarativeEnginePrivate::quit(QScriptContext * /*ctxt*/, QScriptEngine *e) { QDeclarativeEnginePrivate *qe = get (e); - qe->sendQuit (); + qe->sendQuit(); return QScriptValue(); } |