diff options
| author | Matt Broadstone <mbroadst@gmail.com> | 2012-11-16 10:10:06 -0500 |
|---|---|---|
| committer | Jeremy Lainé <jeremy.laine@m4x.org> | 2012-11-16 16:31:16 +0100 |
| commit | bef7287e70ad671d5f06edd47ec050c67a0667cb (patch) | |
| tree | d6ad9cb9084e3c6b9047e87b8e93d45298448251 /src/client/QXmppInvokable.cpp | |
| parent | 0e07f82c8d7851e02fc5340cacfc5d4d5accb699 (diff) | |
| download | qxmpp-bef7287e70ad671d5f06edd47ec050c67a0667cb.tar.gz | |
convert QMetaType::construct to QMetaType::create for qt >= 5
Diffstat (limited to 'src/client/QXmppInvokable.cpp')
| -rw-r--r-- | src/client/QXmppInvokable.cpp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/client/QXmppInvokable.cpp b/src/client/QXmppInvokable.cpp index 8ca5ca8b..b387742b 100644 --- a/src/client/QXmppInvokable.cpp +++ b/src/client/QXmppInvokable.cpp @@ -57,7 +57,12 @@ QVariant QXmppInvokable::dispatch( const QByteArray & method, const QList< QVari const char *typeName = metaObject()->method(idx).typeName(); int resultType = QMetaType::type(typeName); + +#if QT_VERSION >= 0x050000 + void *result = QMetaType::create(resultType, 0); +#else void *result = QMetaType::construct(resultType, 0); +#endif QGenericReturnArgument ret( typeName, result ); QList<QGenericArgument> genericArgs; |