From 55be24d6b6e66bd54168021f5a467ba4da73b2c6 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Thu, 2 Apr 2020 09:57:13 +0200 Subject: Remove QRegExp from qml autotests QRegExp will get removed in Qt6. Clean up by removing dependencies on QRegExp in the autotests. Change-Id: I8ef8561ba30b98b61cd9ed52907b48c5969f2c49 Reviewed-by: Ulf Hermann --- tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp') diff --git a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp index fc50c2a09f..94a51f7f7b 100644 --- a/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp +++ b/tests/auto/qml/qqmlecmascript/tst_qqmlecmascript.cpp @@ -2528,14 +2528,6 @@ void tst_qqmlecmascript::regExpBug() QQmlEngine engine; //QTBUG-9367 - { - QQmlComponent component(&engine, testFileUrl("regExp.qml")); - MyQmlObject *object = qobject_cast(component.create()); - QVERIFY(object != nullptr); - QCOMPARE(object->regExp().pattern(), QLatin1String("[a-zA-z]")); - delete object; - } - { QQmlComponent component(&engine, testFileUrl("regularExpression.qml")); QScopedPointer object(qobject_cast(component.create())); @@ -2544,15 +2536,6 @@ void tst_qqmlecmascript::regExpBug() } //QTBUG-23068 - { - QString err = QString(QLatin1String("%1:6 Invalid property assignment: regular expression expected; use /pattern/ syntax\n")).arg(testFileUrl("regExp.2.qml").toString()); - QQmlComponent component(&engine, testFileUrl("regExp.2.qml")); - QTest::ignoreMessage(QtWarningMsg, "QQmlComponent: Component is not ready"); - MyQmlObject *object = qobject_cast(component.create()); - QVERIFY(!object); - QCOMPARE(component.errorString(), err); - } - { const QString err = QString::fromLatin1("%1:6 Invalid property assignment: " "regular expression expected; " -- cgit v1.2.3