From ae2864788a46a1bf21a26f497e25dcdf99d8e98e Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Tue, 17 Apr 2012 20:04:31 +0200 Subject: Addapt QtScript to the new moc output MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As changed by change If0b8f586cbaf633eed10045adee3ba3366826c86 in qtbase. Change-Id: If6556f75451c6a2c7e78b7987dc713d1b9b30179 Reviewed-by: Kent Hansen Reviewed-by: Jędrzej Nowacki --- src/script/bridge/qscriptqobject.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/script/bridge/qscriptqobject.cpp') 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 -- cgit v1.2.1