diff options
| author | Sona Kurazyan <sona.kurazyan@qt.io> | 2019-08-02 15:38:00 +0200 |
|---|---|---|
| committer | Sona Kurazyan <sona.kurazyan@qt.io> | 2019-08-20 11:20:47 +0200 |
| commit | 4268258b8d3ea302809c5aa5713ae9570f1739fb (patch) | |
| tree | c2b69e3ea41e1578aa8f7e66cf77e53cb941a24a /tests/auto/qml/qjsengine | |
| parent | 560b5bcd277907538b71c147d12fdf3d41b1848c (diff) | |
Remove the last usages of deprecated APIs
- Replaced the usages of deprecated APIs by corresponding
alternatives.
- Fixed building the tests with disabled deprecated APIs.
Task-number: QTBUG-76491
Change-Id: Ie8c5deb22c2074d39a64346c20e5384a7b2ad99b
Reviewed-by: Volker Hilsheimer <volker.hilsheimer@qt.io>
Diffstat (limited to 'tests/auto/qml/qjsengine')
| -rw-r--r-- | tests/auto/qml/qjsengine/tst_qjsengine.cpp | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/tests/auto/qml/qjsengine/tst_qjsengine.cpp b/tests/auto/qml/qjsengine/tst_qjsengine.cpp index 0ccb8210bc..1c895eb793 100644 --- a/tests/auto/qml/qjsengine/tst_qjsengine.cpp +++ b/tests/auto/qml/qjsengine/tst_qjsengine.cpp @@ -201,7 +201,9 @@ private slots: void engineForObject(); void intConversion_QTBUG43309(); +#ifdef QT_DEPRECATED void toFixed(); +#endif void argumentEvaluationOrder(); @@ -4323,7 +4325,10 @@ void tst_QJSEngine::engineForObject() QVERIFY(!qjsEngine(&object)); QJSValue wrapper = engine.newQObject(&object); QQmlEngine::setObjectOwnership(&object, QQmlEngine::CppOwnership); + QVERIFY(qjsEngine(&object)); +#ifdef QT_DEPRECATED QCOMPARE(qjsEngine(&object), wrapper.engine()); +#endif } QVERIFY(!qjsEngine(&object)); } @@ -4338,6 +4343,7 @@ void tst_QJSEngine::intConversion_QTBUG43309() QCOMPARE(result.toNumber(), 25.0); } +#ifdef QT_DEPRECATED // QTBUG-44039 and QTBUG-43885: void tst_QJSEngine::toFixed() { @@ -4349,6 +4355,7 @@ void tst_QJSEngine::toFixed() QVERIFY(result.isString()); QCOMPARE(result.toString(), QStringLiteral("12.1")); } +#endif void tst_QJSEngine::argumentEvaluationOrder() { |