Merge remote-tracking branch 'origin/5.9' into devv5.10.0-alpha1

Conflicts:
	.qmake.conf

Change-Id: Ibf86cdf744d1081f40f734e4a30ca24581e1cc2d

1 files changed, 2 insertions, 2 deletions

diff --git a/src/webchannel/qmetaobjectpublisher.cpp b/src/webchannel/qmetaobjectpublisher.cpp
index dcc589c..cfc6ad2 100644
--- a/src/webchannel/qmetaobjectpublisher.cpp
+++ b/src/webchannel/qmetaobjectpublisher.cpp
@@ -383,12 +383,12 @@ QVariant QMetaObjectPublisher::invokeMethod(QObject *const object, const int met
                   arguments[0], arguments[1], arguments[2], arguments[3], arguments[4],
                   arguments[5], arguments[6], arguments[7], arguments[8], arguments[9]);
     } else {
-        QGenericReturnArgument returnArgument(method.typeName(), returnValue.data());
-
         // Only init variant with return type if its not a variant itself, which would
         // lead to nested variants which is not what we want.
         if (method.returnType() != QMetaType::QVariant)
             returnValue = QVariant(method.returnType(), 0);
+
+        QGenericReturnArgument returnArgument(method.typeName(), returnValue.data());
         method.invoke(object, returnArgument,
                   arguments[0], arguments[1], arguments[2], arguments[3], arguments[4],
                   arguments[5], arguments[6], arguments[7], arguments[8], arguments[9]);