2 files changed, 8 insertions, 7 deletions
diff --git a/tests/auto/xml/sax/qxmlinputsource/tst_qxmlinputsource.cpp b/tests/auto/xml/sax/qxmlinputsource/tst_qxmlinputsource.cpp
index 752e39c23f..d40c8c2fd6 100644
--- a/tests/auto/xml/sax/qxmlinputsource/tst_qxmlinputsource.cpp
+++ b/tests/auto/xml/sax/qxmlinputsource/tst_qxmlinputsource.cpp
@@ -34,6 +34,7 @@
 #include <QTcpServer>
 #include <QTcpSocket>
 #include <QTimer>
+#include <QElapsedTimer>
 #include <QtDebug>
 #include <QtTest/QtTest>
 #include <QXmlDefaultHandler>
@@ -259,7 +260,7 @@ public:
         // Delibrately wait a maximum of 10 seconds for the sake
         // of the test, so it doesn't unduly hang
         const int waitTime = qMax(10000, msecs);
-        QTime t;
+        QElapsedTimer t;
         t.start();
         while (t.elapsed() < waitTime) {
             QCoreApplication::processEvents();
diff --git a/tests/auto/xml/sax/qxmlsimplereader/parser/parser.cpp b/tests/auto/xml/sax/qxmlsimplereader/parser/parser.cpp
index 17351883c3..556603a681 100644
--- a/tests/auto/xml/sax/qxmlsimplereader/parser/parser.cpp
+++ b/tests/auto/xml/sax/qxmlsimplereader/parser/parser.cpp
@@ -28,7 +28,7 @@
 
 
 #include <qxml.h>
-#include <qregexp.h>
+#include <qregularexpression.h>
 
 #include "parser.h"
 
@@ -139,11 +139,11 @@ bool ContentHandler::startElement(const QString &namespaceURI,
 QString ContentHandler::escapeStr(const QString &s)
 {
     QString result = s;
-    result.replace(QRegExp("\""), "\\\"");
-    result.replace(QRegExp("\\"), "\\\\");
-    result.replace(QRegExp("\n"), "\\n");
-    result.replace(QRegExp("\r"), "\\r");
-    result.replace(QRegExp("\t"), "\\t");
+    result.replace(QRegularExpression("\""), "\\\"");
+    result.replace(QRegularExpression("\\"), "\\\\");
+    result.replace(QRegularExpression("\n"), "\\n");
+    result.replace(QRegularExpression("\r"), "\\r");
+    result.replace(QRegularExpression("\t"), "\\t");
     return result;
 }