Deprecate QVariant::Type

It's been obsolete for a long time already. Make sure
the compiler now warns about it and remove all remaining
uses in qtbase.

Change-Id: I0ff80311184dba52d2ba5f4e2fabe0d47fdc59d7
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

1 files changed, 2 insertions, 2 deletions

diff --git a/src/dbus/qdbusmarshaller.cpp b/src/dbus/qdbusmarshaller.cpp
index 4977d7b265..03da1a6780 100644
--- a/src/dbus/qdbusmarshaller.cpp
+++ b/src/dbus/qdbusmarshaller.cpp
@@ -192,7 +192,7 @@ inline bool QDBusMarshaller::append(const QDBusVariant &arg)
     QMetaType id = value.metaType();
     if (!id.isValid()) {
         qWarning("QDBusMarshaller: cannot add a null QDBusVariant");
-        error(QLatin1String("Variant containing QVariant::Invalid passed in arguments"));
+        error(QLatin1String("Invalid QVariant passed in arguments"));
         return false;
     }
 
@@ -386,7 +386,7 @@ bool QDBusMarshaller::appendVariantInternal(const QVariant &arg)
     QMetaType id = arg.metaType();
     if (!id.isValid()) {
         qWarning("QDBusMarshaller: cannot add an invalid QVariant");
-        error(QLatin1String("Variant containing QVariant::Invalid passed in arguments"));
+        error(QLatin1String("Invalid QVariant passed in arguments"));
         return false;
     }