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/qqmlimport | |
| 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/qqmlimport')
| -rw-r--r-- | tests/auto/qml/qqmlimport/qqmlimport.pro | 1 | ||||
| -rw-r--r-- | tests/auto/qml/qqmlimport/tst_qqmlimport.cpp | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/tests/auto/qml/qqmlimport/qqmlimport.pro b/tests/auto/qml/qqmlimport/qqmlimport.pro index 6c99c00570..193f327dc1 100644 --- a/tests/auto/qml/qqmlimport/qqmlimport.pro +++ b/tests/auto/qml/qqmlimport/qqmlimport.pro @@ -8,4 +8,3 @@ SOURCES += tst_qqmlimport.cpp include (../../shared/util.pri) CONFIG += parallel_test -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 diff --git a/tests/auto/qml/qqmlimport/tst_qqmlimport.cpp b/tests/auto/qml/qqmlimport/tst_qqmlimport.cpp index c53977482b..ab3d020c82 100644 --- a/tests/auto/qml/qqmlimport/tst_qqmlimport.cpp +++ b/tests/auto/qml/qqmlimport/tst_qqmlimport.cpp @@ -81,7 +81,7 @@ void tst_QQmlImport::testDesignerSupported() warningString.remove('\r'); #endif warningString = warningString.arg(testFileUrl("testfile_unsupported.qml").toString()); - QTest::ignoreMessage(QtWarningMsg, warningString.toAscii()); + QTest::ignoreMessage(QtWarningMsg, warningString.toLocal8Bit()); window->setSource(testFileUrl("testfile_unsupported.qml")); QVERIFY(!window->errors().isEmpty()); |