diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-19 10:53:10 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2009-11-19 10:53:42 (GMT) |
| commit | 80dfb33cc5fec8fd19e78a959e02588ce58736ee (patch) | |
| tree | d9afe6da9127c63409862623b5a4ffa4598e1bf2 /src/script/api/qscriptengine.cpp | |
| parent | a73e660fd05bafc402d63d71e811a621e46f452d (diff) | |
| parent | 1b14c3d33dea0fe4814f2749c49cf916ca13e012 (diff) | |
| download | Qt-80dfb33cc5fec8fd19e78a959e02588ce58736ee.zip Qt-80dfb33cc5fec8fd19e78a959e02588ce58736ee.tar.gz Qt-80dfb33cc5fec8fd19e78a959e02588ce58736ee.tar.bz2 | |
Merge oslo-staging-2/4.6 into upstream/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 d519102..b06ff0c 100644 --- a/src/script/api/qscriptengine.cpp +++ b/src/script/api/qscriptengine.cpp @@ -1302,7 +1302,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; } |