diff options
| author | Debao Zhang <dbzhang800@gmail.com> | 2012-04-29 00:11:28 -0700 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-02 08:30:59 +0200 |
| commit | ade888860334d207f5f070b0bc9c4c98deaf3862 (patch) | |
| tree | 133a3bde54e8ef5fa8857814a45cc5000ee5b287 /tests/auto/dbus/qdbuslocalcalls | |
| parent | 6102ab8d646d76a68bb460885394501e90b4fd1f (diff) | |
Don't use obsolete qVariantValue, qVariantCanConvert, etc.
qVariantValue and qVariantCanConvert are Compatibility members, while in
Qt4.8 they are marked as Qt 3 Support Members.
qVariantFromValue and qVariantSetValue are Obsolete members.
Change-Id: Ie8505cad1e0950e40c6f6710fde9f6fb2ac670fd
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'tests/auto/dbus/qdbuslocalcalls')
| -rw-r--r-- | tests/auto/dbus/qdbuslocalcalls/tst_qdbuslocalcalls.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/dbus/qdbuslocalcalls/tst_qdbuslocalcalls.cpp b/tests/auto/dbus/qdbuslocalcalls/tst_qdbuslocalcalls.cpp index 871ae6948d..340455c2bd 100644 --- a/tests/auto/dbus/qdbuslocalcalls/tst_qdbuslocalcalls.cpp +++ b/tests/auto/dbus/qdbuslocalcalls/tst_qdbuslocalcalls.cpp @@ -185,7 +185,7 @@ void tst_QDBusLocalCalls::makeCallsVariant() QFETCH(QVariant, value); QDBusMessage callMsg = QDBusMessage::createMethodCall(conn.baseService(), "/", QString(), "echo"); - callMsg << qVariantFromValue(QDBusVariant(value)); + callMsg << QVariant::fromValue(QDBusVariant(value)); QDBusMessage replyMsg = doCall(callMsg); QCOMPARE(int(replyMsg.type()), int(QDBusMessage::ReplyMessage)); @@ -222,7 +222,7 @@ void tst_QDBusLocalCalls::makeCallsComplex() value << 1 << -42 << 47; QDBusMessage callMsg = QDBusMessage::createMethodCall(conn.baseService(), "/", QString(), "echo"); - callMsg << qVariantFromValue(value); + callMsg << QVariant::fromValue(value); QDBusMessage replyMsg = doCall(callMsg); QCOMPARE(int(replyMsg.type()), int(QDBusMessage::ReplyMessage)); |