summaryrefslogtreecommitdiffstats
path: root/tests/auto/dbus/qdbusabstractinterface
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/dbus/qdbusabstractinterface')
-rw-r--r--tests/auto/dbus/qdbusabstractinterface/pinger.h8
-rw-r--r--tests/auto/dbus/qdbusabstractinterface/tst_qdbusabstractinterface.cpp8
2 files changed, 8 insertions, 8 deletions
diff --git a/tests/auto/dbus/qdbusabstractinterface/pinger.h b/tests/auto/dbus/qdbusabstractinterface/pinger.h
index 7fc6e640fe..0b6e8343bb 100644
--- a/tests/auto/dbus/qdbusabstractinterface/pinger.h
+++ b/tests/auto/dbus/qdbusabstractinterface/pinger.h
@@ -81,19 +81,19 @@ public:
inline RegisteredType complexProp() const
{ return qvariant_cast< RegisteredType >(property("complexProp")); }
inline void setComplexProp(RegisteredType value)
- { setProperty("complexProp", qVariantFromValue(value)); }
+ { setProperty("complexProp", QVariant::fromValue(value)); }
Q_PROPERTY(QString stringProp READ stringProp WRITE setStringProp)
inline QString stringProp() const
{ return qvariant_cast< QString >(property("stringProp")); }
inline void setStringProp(const QString &value)
- { setProperty("stringProp", qVariantFromValue(value)); }
+ { setProperty("stringProp", QVariant::fromValue(value)); }
Q_PROPERTY(QDBusVariant variantProp READ variantProp WRITE setVariantProp)
inline QDBusVariant variantProp() const
{ return qvariant_cast< QDBusVariant >(property("variantProp")); }
inline void setVariantProp(const QDBusVariant &value)
- { setProperty("variantProp", qVariantFromValue(value)); }
+ { setProperty("variantProp", QVariant::fromValue(value)); }
public Q_SLOTS: // METHODS
inline QDBusPendingReply<RegisteredType> complexMethod()
@@ -120,7 +120,7 @@ public Q_SLOTS: // METHODS
inline QDBusPendingReply<int> sleepMethod(int in0)
{
QList<QVariant> argumentList;
- argumentList << qVariantFromValue(in0);
+ argumentList << QVariant::fromValue(in0);
return asyncCallWithArgumentList(QLatin1String("sleepMethod"), argumentList);
}
diff --git a/tests/auto/dbus/qdbusabstractinterface/tst_qdbusabstractinterface.cpp b/tests/auto/dbus/qdbusabstractinterface/tst_qdbusabstractinterface.cpp
index 59ec2955e4..48ea1e45af 100644
--- a/tests/auto/dbus/qdbusabstractinterface/tst_qdbusabstractinterface.cpp
+++ b/tests/auto/dbus/qdbusabstractinterface/tst_qdbusabstractinterface.cpp
@@ -582,7 +582,7 @@ void tst_QDBusAbstractInterface::variantPropWrite()
QVERIFY2(p, "Not connected to D-Bus");
QDBusVariant expectedValue = QDBusVariant(Q_INT64_C(-47));
- QVERIFY(p->setProperty("variantProp", qVariantFromValue(expectedValue)));
+ QVERIFY(p->setProperty("variantProp", QVariant::fromValue(expectedValue)));
QCOMPARE(targetObj.m_variantProp.variant(), expectedValue.variant());
}
@@ -603,7 +603,7 @@ void tst_QDBusAbstractInterface::complexPropWrite()
QVERIFY2(p, "Not connected to D-Bus");
RegisteredType expectedValue = RegisteredType("This is a value");
- QVERIFY(p->setProperty("complexProp", qVariantFromValue(expectedValue)));
+ QVERIFY(p->setProperty("complexProp", QVariant::fromValue(expectedValue)));
QCOMPARE(targetObj.m_complexProp, expectedValue);
}
@@ -652,7 +652,7 @@ void tst_QDBusAbstractInterface::variantPropWritePeer()
resetServer();
QDBusVariant expectedValue = QDBusVariant(Q_INT64_C(-47));
- QVERIFY(p->setProperty("variantProp", qVariantFromValue(expectedValue)));
+ QVERIFY(p->setProperty("variantProp", QVariant::fromValue(expectedValue)));
QEXPECT_FAIL("", "QTBUG-24262 peer tests are broken", Abort);
QCOMPARE(targetObj.m_variantProp.variant(), expectedValue.variant());
}
@@ -676,7 +676,7 @@ void tst_QDBusAbstractInterface::complexPropWritePeer()
resetServer();
RegisteredType expectedValue = RegisteredType("This is a value");
- QVERIFY(p->setProperty("complexProp", qVariantFromValue(expectedValue)));
+ QVERIFY(p->setProperty("complexProp", QVariant::fromValue(expectedValue)));
QEXPECT_FAIL("", "QTBUG-24262 peer tests are broken", Abort);
QCOMPARE(targetObj.m_complexProp, expectedValue);
}