diff options
| author | Maximilian Goldstein <max.goldstein@qt.io> | 2020-08-20 09:47:04 +0200 |
|---|---|---|
| committer | Maximilian Goldstein <max.goldstein@qt.io> | 2020-08-20 14:57:51 +0200 |
| commit | ad0fd44600e689da9b04680a5905b5a81cc53641 (patch) | |
| tree | 768ff7062ba3e1e31fe5aa199de4930616a2db4a /tests/auto/qml/qqmlproperty | |
| parent | ed73efa27acd8e7c42a960ef90c2e4a898c20c30 (diff) | |
Fix tst_qqmlproperty failures due to stricter QVariant
Change-Id: Ie1f0ee6ae076e50053a19b19e48fe6e996696a69
Reviewed-by: Fawzi Mohamed <fawzi.mohamed@qt.io>
Diffstat (limited to 'tests/auto/qml/qqmlproperty')
| -rw-r--r-- | tests/auto/qml/qqmlproperty/tst_qqmlproperty.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/qml/qqmlproperty/tst_qqmlproperty.cpp b/tests/auto/qml/qqmlproperty/tst_qqmlproperty.cpp index ae9ced909f..adaba5ccfd 100644 --- a/tests/auto/qml/qqmlproperty/tst_qqmlproperty.cpp +++ b/tests/auto/qml/qqmlproperty/tst_qqmlproperty.cpp @@ -1427,9 +1427,9 @@ void tst_qqmlproperty::write() QCOMPARE(qcharProperty.write(QString("foo")), false); QCOMPARE(qcharProperty.write('Q'), true); - QCOMPARE(qcharProperty.read(), QVariant('Q')); + QCOMPARE(qcharProperty.read(), QChar('Q')); QCOMPARE(qcharProperty.write(QChar(black_circle)), true); - QCOMPARE(qcharProperty.read(), QVariant(QChar(black_circle))); + QCOMPARE(qcharProperty.read(), QChar(black_circle)); QCOMPARE(o.stringProperty(), QString("foo")); // Default value QCOMPARE(stringProperty.write(QString("bar")), true); @@ -1439,7 +1439,7 @@ void tst_qqmlproperty::write() QCOMPARE(stringProperty.write('A'), true); QCOMPARE(stringProperty.read().toString(), QString::number('A')); QCOMPARE(stringProperty.write(QChar(black_circle)), true); - QCOMPARE(stringProperty.read(), QVariant(QChar(black_circle))); + QCOMPARE(stringProperty.read(), QString(black_circle)); { // QChar -> QString QQmlComponent component(&engine); |