Adapt to Qt5 meta-object changes
authorKent Hansen <kent.hansen@nokia.com>
Mon, 5 Mar 2012 07:31:00 +0000 (08:31 +0100)
committerQt by Nokia <qt-info@nokia.com>
Tue, 13 Mar 2012 11:58:48 +0000 (12:58 +0100)
commit4dd4c442e15a155ff3784f28d6c1ebc68fe8382e
treee3220da00e3cc22a3a0cfad855db69e2adf8a376
parent4338b35c71060c33e7b0dd026a52b8d845d0b8d4
Adapt to Qt5 meta-object changes

QMetaMethod::signature() has been renamed to methodSignature(), and
it now returns a QByteArray. Also, the new function
QMetaMethod::isValid() should be used to determine whether a method
is valid, instead of relying on signature() returning a 0 pointer.

Where it makes sense, the existing code that was using signature()
and parameterTypes() has been changed to use the new API
QMetaMethod::name(), parameterCount(), and parameterType(int).

Also, in the new meta-object revision (7), the QMetaObject stringdata
member is now of type QByteArrayData*. QFastMetaBuilder will be
ported to generate the new format, but for now it's sufficient to
reinterpret_cast the stringdata assignment to keep it compiling.

Change-Id: Ie340ef17bcebc3afa4aae6450dfe2d06e4d881a4
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
15 files changed:
src/qml/debugger/qqmlenginedebugservice.cpp
src/qml/qml/ftw/qfastmetabuilder.cpp
src/qml/qml/qqmlboundsignal.cpp
src/qml/qml/qqmlmetatype.cpp
src/qml/qml/qqmlproperty.cpp
src/qml/qml/qqmlpropertycache.cpp
src/qml/qml/qqmlvme.cpp
src/qml/qml/qqmlvmemetaobject.cpp
src/qml/qml/v8/qv8qobjectwrapper.cpp
src/quick/items/qquickshadereffect.cpp
src/quick/particles/qquickcustomparticle.cpp
tests/auto/qml/qqmlmetaobject/tst_qqmlmetaobject.cpp
tests/auto/qml/qqmlproperty/tst_qqmlproperty.cpp
tests/auto/quick/qquickstates/tst_qquickstates.cpp
tools/qmlplugindump/main.cpp