Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-2

Conflicts:
	src/dbus/qdbusmacros.h

1 files changed, 6 insertions, 6 deletions

diff --git a/src/activeqt/container/qaxbase.cpp b/src/activeqt/container/qaxbase.cpp
index 7692749..806e2b1 100644
--- a/src/activeqt/container/qaxbase.cpp
+++ b/src/activeqt/container/qaxbase.cpp
@@ -3540,7 +3540,7 @@ int QAxBase::internalProperty(QMetaObject::Call call, int index, void **v)
                     proptype = 0;
                 } else if (t == QVariant::UserType) {
                     qvar = QVariant(qRegisterMetaType<void*>(prop.typeName()), (void**)v[0]);
-//                    qVariantSetValue(qvar, *(void**)v[0], prop.typeName());
+//                    qvar.setValue(*(void**)v[0], prop.typeName());
                 } else {
                     proptype = d->metaObject()->propertyType(propname);
                     qvar = QVariant(t, v[0]);
@@ -3628,9 +3628,9 @@ int QAxBase::internalInvoke(QMetaObject::Call call, int index, void **v)
 
         if (!qvar.isValid()) {
             if (type == "IDispatch*")
-                qVariantSetValue(qvar, *(IDispatch**)v[p+1]);
+                qvar.setValue(*(IDispatch**)v[p+1]);
             else if (type == "IUnknown*")
-                qVariantSetValue(qvar, *(IUnknown**)v[p+1]);
+                qvar.setValue(*(IUnknown**)v[p+1]);
             else if (type == "QVariant")
                 qvar = *(QVariant*)v[p + 1];
             else if (mo->indexOfEnumerator(type) != -1)
@@ -4395,15 +4395,15 @@ QVariant QAxBase::asVariant() const
     QByteArray cn(className());
     if (cn == "QAxObject" || cn == "QAxWidget" || cn == "QAxBase") {
         if (d->dispatch())
-            qVariantSetValue(qvar, d->dispatch());
+            qvar.setValue(d->dispatch());
         else if (d->ptr)
-            qVariantSetValue(qvar, d->ptr);
+            qvar.setValue(d->ptr);
     } else {
         cn = cn.mid(cn.lastIndexOf(':') + 1);
         QObject *object = qObject();
         if (QMetaType::type(cn))
             qvar = QVariant(qRegisterMetaType<QObject*>(cn + '*'), &object);
-//            qVariantSetValue(qvar, qObject(), cn + '*');
+//            qvar.setValue(qObject(), cn + '*');
     }
 
     return qvar;