diff options
| author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-08-24 14:11:03 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2015-09-02 04:19:22 +0000 |
| commit | 06f11da5e17d292eab510b3d9f7c7455108bb91c (patch) | |
| tree | cb87a617222cfb0f1cef177294a523115b3d5783 /tests/auto/qml/qjsvalue | |
| parent | 9713146cbc91d7e41af73ac5af1ec09bce028e1b (diff) | |
Tests: Remove QT_DISABLE_DEPRECATED_BEFORE=0 for simple cases.
Fix usage of API that is marked deprecated.
Change-Id: Ia887437f99b9ce207891ca19bc49294acb7d629d
Reviewed-by: Liang Qi <liang.qi@theqtcompany.com>
Diffstat (limited to 'tests/auto/qml/qjsvalue')
| -rw-r--r-- | tests/auto/qml/qjsvalue/qjsvalue.pro | 1 | ||||
| -rw-r--r-- | tests/auto/qml/qjsvalue/tst_qjsvalue.cpp | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/tests/auto/qml/qjsvalue/qjsvalue.pro b/tests/auto/qml/qjsvalue/qjsvalue.pro index d914d40762..08af6830ec 100644 --- a/tests/auto/qml/qjsvalue/qjsvalue.pro +++ b/tests/auto/qml/qjsvalue/qjsvalue.pro @@ -5,4 +5,3 @@ macx:CONFIG -= app_bundle QT += qml widgets testlib gui-private SOURCES += tst_qjsvalue.cpp HEADERS += tst_qjsvalue.h -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qml/qjsvalue/tst_qjsvalue.cpp b/tests/auto/qml/qjsvalue/tst_qjsvalue.cpp index bea44cb6e3..c3d95a10fb 100644 --- a/tests/auto/qml/qjsvalue/tst_qjsvalue.cpp +++ b/tests/auto/qml/qjsvalue/tst_qjsvalue.cpp @@ -1015,7 +1015,7 @@ void tst_QJSValue::toVariant() { QVariant var = qobject.toVariant(); QCOMPARE(var.userType(), int(QMetaType::QObjectStar)); - QCOMPARE(qVariantValue<QObject*>(var), (QObject *)&temp); + QCOMPARE(qvariant_cast<QObject*>(var), (QObject *)&temp); } { |