summaryrefslogtreecommitdiffstats
path: root/src/testlib
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2020-06-15 09:09:08 +0200
committerLars Knoll <lars.knoll@qt.io>2020-08-15 10:56:29 +0200
commit8929c0a3550ae27cb5c9ed276d4c5a85594ba682 (patch)
tree56998feaa3acec13cc575a7f95b12b28e4407c44 /src/testlib
parentaf263b003be2f2e111ddc398bc8918cc006fcbb3 (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/testlib')
-rw-r--r--src/testlib/qsignaldumper.cpp2
-rw-r--r--src/testlib/qsignalspy.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/testlib/qsignaldumper.cpp b/src/testlib/qsignaldumper.cpp
index f43b3a8d92..977081e98e 100644
--- a/src/testlib/qsignaldumper.cpp
+++ b/src/testlib/qsignaldumper.cpp
@@ -112,7 +112,7 @@ static void qSignalDumperCallback(QObject *caller, int signal_index, void **argv
Q_ASSERT(typeId != QMetaType::Void); // void parameter => metaobject is corrupt
str.append(arg)
.append('(')
- .append(QVariant(typeId, argv[i + 1]).toString().toLocal8Bit())
+ .append(QVariant(QMetaType(typeId), argv[i + 1]).toString().toLocal8Bit())
.append(')');
}
str.append(", ");
diff --git a/src/testlib/qsignalspy.h b/src/testlib/qsignalspy.h
index b514a71a2c..1d42995b4e 100644
--- a/src/testlib/qsignalspy.h
+++ b/src/testlib/qsignalspy.h
@@ -221,7 +221,7 @@ private:
if (type == QMetaType::QVariant)
list << *reinterpret_cast<QVariant *>(a[i + 1]);
else
- list << QVariant(type, a[i + 1]);
+ list << QVariant(QMetaType(type), a[i + 1]);
}
append(list);