summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@woboq.com>2012-04-17 20:04:31 +0200
committerQt by Nokia <qt-info@nokia.com>2012-04-25 22:49:02 +0200
commitae2864788a46a1bf21a26f497e25dcdf99d8e98e (patch)
tree428a83f8c753a61efdb5ca47db8ef436af6629d3 /src
parent13c486bfc75b8a434981f756d518d3fbfebe7298 (diff)
downloadqtscript-ae2864788a46a1bf21a26f497e25dcdf99d8e98e.tar.gz
Addapt QtScript to the new moc output
As changed by change If0b8f586cbaf633eed10045adee3ba3366826c86 in qtbase. Change-Id: If6556f75451c6a2c7e78b7987dc713d1b9b30179 Reviewed-by: Kent Hansen <kent.hansen@nokia.com> Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
Diffstat (limited to 'src')
-rw-r--r--src/script/bridge/qscriptqobject.cpp6
1 files changed, 1 insertions, 5 deletions
diff --git a/src/script/bridge/qscriptqobject.cpp b/src/script/bridge/qscriptqobject.cpp
index 7353757..c33cf71 100644
--- a/src/script/bridge/qscriptqobject.cpp
+++ b/src/script/bridge/qscriptqobject.cpp
@@ -2048,13 +2048,9 @@ void QObjectConnectionManager::qt_static_metacall(QObject *_o, QMetaObject::Call
}
}
-const QMetaObjectExtraData QObjectConnectionManager::staticMetaObjectExtraData = {
- 0, qt_static_metacall
-};
-
const QMetaObject QObjectConnectionManager::staticMetaObject = {
{ &QObject::staticMetaObject, qt_meta_stringdata_QObjectConnectionManager.data,
- qt_meta_data_QObjectConnectionManager, &staticMetaObjectExtraData }
+ qt_meta_data_QObjectConnectionManager, qt_static_metacall, 0 }
};
const QMetaObject *QObjectConnectionManager::metaObject() const