2 files changed, 9 insertions, 44 deletions
diff --git a/src/webchannel/qmetaobjectpublisher.cpp b/src/webchannel/qmetaobjectpublisher.cpp
index 2f0ef74..1d0124c 100644
--- a/src/webchannel/qmetaobjectpublisher.cpp
+++ b/src/webchannel/qmetaobjectpublisher.cpp
@@ -343,7 +343,11 @@ bool QMetaObjectPublisher::invokeMethod(QObject *const object, const int methodI
     // construct converter objects of QVariant to QGenericArgument
     VariantArgument arguments[10];
     for (int i = 0; i < qMin(args.size(), method.parameterCount()); ++i) {
-        arguments[i].setValue(args.at(i).toVariant(), method.parameterType(i));
+        QVariant arg = args.at(i).toVariant();
+        if (method.parameterType(i) != QMetaType::QVariant && !arg.convert(method.parameterType(i))) {
+            qWarning() << "Could not convert argument" << args.at(i) << "to target type" << method.parameterTypes().at(i) << '.';
+        }
+        arguments[i].value = arg;
     }
 
     // construct QGenericReturnArgument
diff --git a/src/webchannel/variantargument_p.h b/src/webchannel/variantargument_p.h
index ee625fc..5f17953 100644
--- a/src/webchannel/variantargument_p.h
+++ b/src/webchannel/variantargument_p.h
@@ -44,60 +44,21 @@
 #define VARIANTARGUMENT_H
 
 #include <QVariant>
-#include <QMetaType>
 
 /**
  * RAII QVariant to Q[Generic]Argument conversion
  */
-class VariantArgument
+struct VariantArgument
 {
-public:
-    explicit VariantArgument()
-    : m_data(0)
-    , m_paramType(0)
-    {
-    }
-
-    /// TODO: test with C++ methods that don't take a QVariant as arg
-    ///       also test conversions
-    void setValue(const QVariant &value, int paramType)
-    {
-        if (m_data) {
-            QMetaType::destroy(m_paramType, m_data);
-            m_name.clear();
-            m_data = 0;
-        }
-
-        m_paramType = paramType;
-
-        if (value.isValid()) {
-            m_name = value.typeName();
-            m_data = QMetaType::create(m_paramType, value.constData());
-        }
-    }
-
-    ~VariantArgument()
-    {
-        if (m_data) {
-            QMetaType::destroy(m_paramType, m_data);
-            m_data = 0;
-        }
-    }
-
     operator QGenericArgument() const
     {
-        if (!m_data) {
+        if (!value.isValid()) {
             return QGenericArgument();
         }
-        return QGenericArgument(m_name.constData(), m_data);
+        return QGenericArgument(value.typeName(), value.constData());
     }
 
-private:
-    Q_DISABLE_COPY(VariantArgument)
-
-    QByteArray m_name;
-    void* m_data;
-    int m_paramType;
+    QVariant value;
 };
 
 #endif // VARIANTARGUMENT_H