diff options
| author | Marc Mutz <marc.mutz@qt.io> | 2023-03-03 08:17:27 +0100 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@qt.io> | 2023-03-03 20:05:27 +0100 |
| commit | fd17eaca8396288f34e89f5f66d2779c42ffc414 (patch) | |
| tree | eb857c76db21cbc22ca6bd06febe43dc6510a888 /tests/auto/corelib/kernel/qvariant | |
| parent | cbb484b713f2ed7d1f18d8e9ecbc74d7c59a3c07 (diff) | |
tst_QVariant: check fromValue() with a non-default-constructible type
... by just using fromValue() instead of the QVariant(QMetaType,
void*) ctor.
Code coverage isn't reduced, because fromValue() will, of course, call
that exact ctor itself.
Amends df0085d3a28005e84eb7688cc2575a121ba322aa.
Pick-to: 6.5 6.4 6.2
Task-number: QTBUG-105140
Task-number: QTBUG-111598
Change-Id: I02464803090fa7078947625616e6fc20e623ef31
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests/auto/corelib/kernel/qvariant')
| -rw-r--r-- | tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp index 87b9e20770..1bfc7b91f0 100644 --- a/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp +++ b/tests/auto/corelib/kernel/qvariant/tst_qvariant.cpp @@ -5602,7 +5602,7 @@ void tst_QVariant::constructFromIncompatibleMetaType() void tst_QVariant::copyNonDefaultConstructible() { NonDefaultConstructible ndc(42); - QVariant var(QMetaType::fromType<NonDefaultConstructible>(), &ndc); + QVariant var = QVariant::fromValue(ndc); QVERIFY(var.isDetached()); QCOMPARE(var.metaType(), QMetaType::fromType<NonDefaultConstructible>()); QVERIFY(var.constData() != &ndc); |