diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-11-19 12:08:44 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-11-19 12:08:44 (GMT) |
| commit | acb5cd795f4ea75794cfd31eaf768ec5a3e62844 (patch) | |
| tree | 28064e139d82b1f51c43b67c078855524b52821c /src/script/api/qscriptengine.cpp | |
| parent | 65e00180516eb136c2a7119dfe9e63fc9c66065e (diff) | |
| parent | 8e401cd4ae0133531613a3e097acc57979d78f50 (diff) | |
| download | Qt-acb5cd795f4ea75794cfd31eaf768ec5a3e62844.zip Qt-acb5cd795f4ea75794cfd31eaf768ec5a3e62844.tar.gz Qt-acb5cd795f4ea75794cfd31eaf768ec5a3e62844.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/script/api/qscriptengine.cpp')
| -rw-r--r-- | src/script/api/qscriptengine.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/script/api/qscriptengine.cpp b/src/script/api/qscriptengine.cpp index 02eb9a3..dc0e0d0 100644 --- a/src/script/api/qscriptengine.cpp +++ b/src/script/api/qscriptengine.cpp @@ -1306,7 +1306,7 @@ QScript::QObjectData *QScriptEnginePrivate::qobjectData(QObject *object) QScript::QObjectData *data = new QScript::QObjectData(this); m_qobjectData.insert(object, data); QObject::connect(object, SIGNAL(destroyed(QObject*)), - q_func(), SLOT(_q_objectDestroyed(QObject *))); + q_func(), SLOT(_q_objectDestroyed(QObject*))); return data; } |