summaryrefslogtreecommitdiffstats
path: root/tests/auto/xml/dom/qdom
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/xml/dom/qdom')
-rw-r--r--tests/auto/xml/dom/qdom/CMakeLists.txt21
-rw-r--r--tests/auto/xml/dom/qdom/tst_qdom.cpp8
2 files changed, 25 insertions, 4 deletions
diff --git a/tests/auto/xml/dom/qdom/CMakeLists.txt b/tests/auto/xml/dom/qdom/CMakeLists.txt
new file mode 100644
index 0000000000..be70ec08cc
--- /dev/null
+++ b/tests/auto/xml/dom/qdom/CMakeLists.txt
@@ -0,0 +1,21 @@
+# Generated from qdom.pro.
+
+#####################################################################
+## tst_qdom Test:
+#####################################################################
+
+# Collect test data
+file(GLOB_RECURSE test_data_glob
+ RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
+ testdata/*)
+list(APPEND test_data ${test_data_glob})
+list(APPEND test_data "doubleNamespaces.xml")
+list(APPEND test_data "umlaut.xml")
+
+add_qt_test(tst_qdom
+ SOURCES
+ tst_qdom.cpp
+ PUBLIC_LIBRARIES
+ Qt::Xml
+ TESTDATA ${test_data}
+)
diff --git a/tests/auto/xml/dom/qdom/tst_qdom.cpp b/tests/auto/xml/dom/qdom/tst_qdom.cpp
index 1a26376456..7cb110eab7 100644
--- a/tests/auto/xml/dom/qdom/tst_qdom.cpp
+++ b/tests/auto/xml/dom/qdom/tst_qdom.cpp
@@ -33,7 +33,7 @@
#include <QDebug>
#include <QFile>
#include <QList>
-#include <QRegExp>
+#include <QRegularExpression>
#include <QTextStream>
#include <QtTest/QtTest>
#include <QtXml>
@@ -527,10 +527,10 @@ void tst_QDom::save_data()
QTest::addColumn<int>("indent");
QTest::addColumn<QString>("res");
- QTest::newRow( "01" ) << doc01 << 0 << QString(doc01).replace( QRegExp(" "), "" );
+ QTest::newRow( "01" ) << doc01 << 0 << QString(doc01).replace( QRegularExpression(" "), "" );
QTest::newRow( "02" ) << doc01 << 1 << doc01;
- QTest::newRow( "03" ) << doc01 << 2 << QString(doc01).replace( QRegExp(" "), " " );
- QTest::newRow( "04" ) << doc01 << 10 << QString(doc01).replace( QRegExp(" "), " " );
+ QTest::newRow( "03" ) << doc01 << 2 << QString(doc01).replace( QRegularExpression(" "), " " );
+ QTest::newRow( "04" ) << doc01 << 10 << QString(doc01).replace( QRegularExpression(" "), " " );
}
void tst_QDom::save()