diff options
Diffstat (limited to 'tests/auto/qml/qqmllanguage')
-rw-r--r-- | tests/auto/qml/qqmllanguage/qqmllanguage.pro | 1 | ||||
-rw-r--r-- | tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp | 6 |
2 files changed, 2 insertions, 5 deletions
diff --git a/tests/auto/qml/qqmllanguage/qqmllanguage.pro b/tests/auto/qml/qqmllanguage/qqmllanguage.pro index f0c8bb6c1b..99c0c3e823 100644 --- a/tests/auto/qml/qqmllanguage/qqmllanguage.pro +++ b/tests/auto/qml/qqmllanguage/qqmllanguage.pro @@ -15,7 +15,6 @@ TESTDATA = data/* QT += core-private gui-private qml-private network testlib include (../../shared/util.pri) -DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0 OTHER_FILES += \ data/readonlyObjectProperty.qml diff --git a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp index 97501118dd..7893114500 100644 --- a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp +++ b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp @@ -673,8 +673,7 @@ void tst_qqmllanguage::assignBasicTypes() QCOMPARE(object->variantProperty(), QVariant("Hello World!")); QCOMPARE(object->vectorProperty(), QVector3D(10, 1, 2.2f)); QCOMPARE(object->vector4Property(), QVector4D(10, 1, 2.2f, 2.3f)); - QUrl encoded; - encoded.setEncodedUrl("main.qml?with%3cencoded%3edata", QUrl::TolerantMode); + const QUrl encoded = QUrl::fromEncoded("main.qml?with%3cencoded%3edata", QUrl::TolerantMode); QCOMPARE(object->urlProperty(), component.url().resolved(encoded)); QVERIFY(object->objectProperty() != 0); MyTypeObject *child = qobject_cast<MyTypeObject *>(object->objectProperty()); @@ -1152,8 +1151,7 @@ void tst_qqmllanguage::bindTypeToJSValue() } { MyQmlObject *object = root->findChild<MyQmlObject *>("urlProperty"); QJSValue value = object->qjsvalue(); - QUrl encoded; - encoded.setEncodedUrl("main.qml?with%3cencoded%3edata", QUrl::TolerantMode); + const QUrl encoded = QUrl::fromEncoded("main.qml?with%3cencoded%3edata", QUrl::TolerantMode); QCOMPARE(value.toString(), component.url().resolved(encoded).toString()); } { MyQmlObject *object = root->findChild<MyQmlObject *>("objectProperty"); |