diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-12 03:00:35 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-02-12 03:00:35 +0100 |
| commit | a21580952f5ba9dbde3ee5a9a7119e2afa692b87 (patch) | |
| tree | d90eee7eb9a24e3f380e7259e147f5cf3bb6fa72 /tests/auto/qscriptvalue/tst_qscriptvalue.cpp | |
| parent | f6b551b31c7d0b76c4e0416f73a2baa1ab29602f (diff) | |
| parent | da2f08af67916ce09daf6dea185a118e0f8bcd6b (diff) | |
| download | qtscript-a21580952f5ba9dbde3ee5a9a7119e2afa692b87.tar.gz | |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: I4f4fee1eed9127999829d0bf3cb6fdb03a2ece48
Diffstat (limited to 'tests/auto/qscriptvalue/tst_qscriptvalue.cpp')
| -rw-r--r-- | tests/auto/qscriptvalue/tst_qscriptvalue.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qscriptvalue/tst_qscriptvalue.cpp b/tests/auto/qscriptvalue/tst_qscriptvalue.cpp index 47e040e..195fe0c 100644 --- a/tests/auto/qscriptvalue/tst_qscriptvalue.cpp +++ b/tests/auto/qscriptvalue/tst_qscriptvalue.cpp @@ -1267,7 +1267,7 @@ void tst_QScriptValue::toVariant() { QVariant var = qobject.toVariant(); QCOMPARE(var.userType(), int(QMetaType::QObjectStar)); - QCOMPARE(qVariantValue<QObject*>(var), (QObject *)this); + QCOMPARE(qvariant_cast<QObject*>(var), (QObject *)this); } { |