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 /src/dbus/qdbusdemarshaller.cpp | |
| 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 'src/dbus/qdbusdemarshaller.cpp')
| -rw-r--r-- | src/dbus/qdbusdemarshaller.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dbus/qdbusdemarshaller.cpp b/src/dbus/qdbusdemarshaller.cpp index 692606b539..0f65adcaad 100644 --- a/src/dbus/qdbusdemarshaller.cpp +++ b/src/dbus/qdbusdemarshaller.cpp @@ -287,7 +287,7 @@ QVariant QDBusDemarshaller::toVariantInternal() case DBUS_TYPE_UNIX_FD: if (capabilities & QDBusConnection::UnixFileDescriptorPassing) - return qVariantFromValue(toUnixFileDescriptor()); + return QVariant::fromValue(toUnixFileDescriptor()); // fall through default: |