1 files changed, 9 insertions, 8 deletions
diff --git a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
index b9337cbee..d3ea27fc2 100644
--- a/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
+++ b/tests/auto/widgets/qwebengineview/tst_qwebengineview.cpp
@@ -47,6 +47,7 @@
 #include <QStyle>
 #include <QtWidgets/qaction.h>
 #include <QWebEngineProfile>
+#include <QtCore/qregularexpression.h>
 
 #define VERIFY_INPUTMETHOD_HINTS(actual, expect) \
     QVERIFY(actual == (expect | Qt::ImhNoPredictiveText | Qt::ImhNoTextHandles | Qt::ImhNoEditMenu));
@@ -274,7 +275,7 @@ void tst_QWebEngineView::getWebKitVersion()
 void tst_QWebEngineView::changePage_data()
 {
     QString html = "<html><head><title>%1</title>"
-                   "<link rel='icon' href='file://" TESTS_SOURCE_DIR "/resources/image2.png'></head></html>";
+                   "<link rel='icon' href='qrc:///resources/image2.png'></head></html>";
     QUrl urlFrom("data:text/html," + html.arg("TitleFrom"));
     QUrl urlTo("data:text/html," + html.arg("TitleTo"));
     QUrl nullPage("data:text/html,<html/>");
@@ -592,8 +593,8 @@ class KeyEventRecordingWidget : public QWidget {
 public:
     QList<QKeyEvent> pressEvents;
     QList<QKeyEvent> releaseEvents;
-    void keyPressEvent(QKeyEvent *e) Q_DECL_OVERRIDE { pressEvents << *e; }
-    void keyReleaseEvent(QKeyEvent *e) Q_DECL_OVERRIDE { releaseEvents << *e; }
+    void keyPressEvent(QKeyEvent *e) override { pressEvents << *e; }
+    void keyReleaseEvent(QKeyEvent *e) override { releaseEvents << *e; }
 };
 
 void tst_QWebEngineView::unhandledKeyEventPropagation()
@@ -883,7 +884,7 @@ public:
     explicit KeyboardAndMouseEventRecordingWidget(QWidget *parent = 0) :
         QWidget(parent), m_eventCounter(0) {}
 
-    bool event(QEvent *event) Q_DECL_OVERRIDE
+    bool event(QEvent *event) override
     {
         QString eventString;
         switch (event->type()) {
@@ -1187,7 +1188,7 @@ void tst_QWebEngineView::changeLocale()
     QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpyDE.count(), 1, 20000);
 
     QTRY_VERIFY(!toPlainTextSync(viewDE.page()).isEmpty());
-    errorLines = toPlainTextSync(viewDE.page()).split(QRegExp("[\r\n]"), QString::SkipEmptyParts);
+    errorLines = toPlainTextSync(viewDE.page()).split(QRegularExpression("[\r\n]"), QString::SkipEmptyParts);
     QCOMPARE(errorLines.first().toUtf8(), QByteArrayLiteral("Die Website ist nicht erreichbar"));
 
     QLocale::setDefault(QLocale("en"));
@@ -1197,7 +1198,7 @@ void tst_QWebEngineView::changeLocale()
     QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpyEN.count(), 1, 20000);
 
     QTRY_VERIFY(!toPlainTextSync(viewEN.page()).isEmpty());
-    errorLines = toPlainTextSync(viewEN.page()).split(QRegExp("[\r\n]"), QString::SkipEmptyParts);
+    errorLines = toPlainTextSync(viewEN.page()).split(QRegularExpression("[\r\n]"), QString::SkipEmptyParts);
     QCOMPARE(errorLines.first().toUtf8(), QByteArrayLiteral("This site can\xE2\x80\x99t be reached"));
 
     // Reset error page
@@ -1210,7 +1211,7 @@ void tst_QWebEngineView::changeLocale()
     QTRY_COMPARE_WITH_TIMEOUT(loadFinishedSpyDE.count(), 1, 20000);
 
     QTRY_VERIFY(!toPlainTextSync(viewDE.page()).isEmpty());
-    errorLines = toPlainTextSync(viewDE.page()).split(QRegExp("[\r\n]"), QString::SkipEmptyParts);
+    errorLines = toPlainTextSync(viewDE.page()).split(QRegularExpression("[\r\n]"), QString::SkipEmptyParts);
     QCOMPARE(errorLines.first().toUtf8(), QByteArrayLiteral("Die Website ist nicht erreichbar"));
 }
 
@@ -2641,7 +2642,7 @@ void tst_QWebEngineView::imeJSInputEvents()
     view.show();
 
     auto logLines = [&view]() -> QStringList {
-        return evaluateJavaScriptSync(view.page(), "log.textContent").toString().split("\n").filter(QRegExp(".+"));
+        return evaluateJavaScriptSync(view.page(), "log.textContent").toString().split("\n").filter(QRegularExpression(".+"));
     };
 
     QSignalSpy loadFinishedSpy(&view, SIGNAL(loadFinished(bool)));