From bef7287e70ad671d5f06edd47ec050c67a0667cb Mon Sep 17 00:00:00 2001 From: Matt Broadstone Date: Fri, 16 Nov 2012 10:10:06 -0500 Subject: convert QMetaType::construct to QMetaType::create for qt >= 5 --- src/client/QXmppInvokable.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/client/QXmppInvokable.cpp') 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 genericArgs; -- cgit v1.2.3