diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2020-06-15 09:09:08 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2020-08-15 10:56:29 +0200 |
| commit | 8929c0a3550ae27cb5c9ed276d4c5a85594ba682 (patch) | |
| tree | 56998feaa3acec13cc575a7f95b12b28e4407c44 /src/dbus/qdbusinternalfilters.cpp | |
| parent | af263b003be2f2e111ddc398bc8918cc006fcbb3 (diff) | |
Remove QVariant(int type, void *data, ...) constructor
It was marked internal anyway. Use the constructor taking a
QMetaType instead.
Change-Id: I15b9cd0911aac063a0f0fe0352fa2c84b7f7c691
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'src/dbus/qdbusinternalfilters.cpp')
| -rw-r--r-- | src/dbus/qdbusinternalfilters.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/dbus/qdbusinternalfilters.cpp b/src/dbus/qdbusinternalfilters.cpp index 74cc470596..3c210a4641 100644 --- a/src/dbus/qdbusinternalfilters.cpp +++ b/src/dbus/qdbusinternalfilters.cpp @@ -358,8 +358,7 @@ static int writeProperty(QObject *obj, const QByteArray &property_name, QVariant if (id != QMetaType::QVariant && value.userType() == QDBusMetaTypeId::argument()) { // we have to demarshall before writing - void *null = nullptr; - QVariant other(id, null); + QVariant other{QMetaType(id)}; if (!QDBusMetaType::demarshall(qvariant_cast<QDBusArgument>(value), id, other.data())) { qWarning("QDBusConnection: type `%s' (%d) is not registered with QtDBus. " "Use qDBusRegisterMetaType to register it", |