Clean-up of test names

We want to only use the qwebengine-prefix for tests of actual classes. Change-Id: I0ab4e17f3b4994cc67e836112965307236d61549 Reviewed-by: Kai Koehne <kai.koehne@qt.io>
author: Allan Sandfeld Jensen <allan.jensen@qt.io> 2018-07-19 14:03:21 +0200
committer: Allan Sandfeld Jensen <allan.jensen@qt.io> 2018-07-23 16:22:41 +0000
commit: a6a42cf01681bda5ad7f97d65f6108534ab7745e (patch)
tree: 5fc125cbb711b089fbe69995c4773baeeebe7d2f
parent: 68ff88a1d767a64dd8d9b90615567789feebcefe (diff)
36 files changed, 115 insertions, 115 deletions
diff --git a/tests/auto/widgets/qwebengineaccessibility/qwebengineaccessibility.pro b/tests/auto/widgets/accessibility/accessibility.pro
index e99c7f493..e99c7f493 100644
--- a/tests/auto/widgets/qwebengineaccessibility/qwebengineaccessibility.pro
+++ b/tests/auto/widgets/accessibility/accessibility.pro
diff --git a/tests/auto/widgets/qwebengineaccessibility/tst_qwebengineaccessibility.cpp b/tests/auto/widgets/accessibility/tst_accessibility.cpp
index c2a15218c..6efbf53ed 100644
--- a/tests/auto/widgets/qwebengineaccessibility/tst_qwebengineaccessibility.cpp
+++ b/tests/auto/widgets/accessibility/tst_accessibility.cpp
@@ -25,7 +25,7 @@
 #include <qwebenginepage.h>
 #include <qwidget.h>
 
-class tst_QWebEngineAccessibility : public QObject
+class tst_Accessibility : public QObject
 {
     Q_OBJECT
 
@@ -46,27 +46,27 @@ private Q_SLOTS:
 
 // This will be called before the first test function is executed.
 // It is only called once.
-void tst_QWebEngineAccessibility::initTestCase()
+void tst_Accessibility::initTestCase()
 {
 }
 
 // This will be called after the last test function is executed.
 // It is only called once.
-void tst_QWebEngineAccessibility::cleanupTestCase()
+void tst_Accessibility::cleanupTestCase()
 {
 }
 
 // This will be called before each test function is executed.
-void tst_QWebEngineAccessibility::init()
+void tst_Accessibility::init()
 {
 }
 
 // This will be called after every test function.
-void tst_QWebEngineAccessibility::cleanup()
+void tst_Accessibility::cleanup()
 {
 }
 
-void tst_QWebEngineAccessibility::noPage()
+void tst_Accessibility::noPage()
 {
     QWebEngineView webView;
     webView.show();
@@ -82,7 +82,7 @@ void tst_QWebEngineAccessibility::noPage()
     QCOMPARE(document->childCount(), 0);
 }
 
-void tst_QWebEngineAccessibility::hierarchy()
+void tst_Accessibility::hierarchy()
 {
     QWebEngineView webView;
     webView.setHtml("<html><body>" \
@@ -142,7 +142,7 @@ void tst_QWebEngineAccessibility::hierarchy()
     QCOMPARE(input, child);
 }
 
-void tst_QWebEngineAccessibility::text()
+void tst_Accessibility::text()
 {
     QWebEngineView webView;
     webView.setHtml("<html><body>" \
@@ -211,7 +211,7 @@ void tst_QWebEngineAccessibility::text()
     QCOMPARE(input3->text(QAccessible::Value), QStringLiteral("Good day!"));
 }
 
-void tst_QWebEngineAccessibility::value()
+void tst_Accessibility::value()
 {
     QWebEngineView webView;
     webView.setHtml("<html><body>" \
@@ -250,7 +250,7 @@ void tst_QWebEngineAccessibility::value()
     QCOMPARE(progressBarValueInterface->maximumValue().toInt(), 99);
 }
 
-void tst_QWebEngineAccessibility::roles_data()
+void tst_Accessibility::roles_data()
 {
     QTest::addColumn<QString>("html");
     QTest::addColumn<bool>("isSection");
@@ -381,7 +381,7 @@ void tst_QWebEngineAccessibility::roles_data()
     //QTest::newRow("AX_ROLE_WINDOW"); // No mapping to ARIA role
 }
 
-void tst_QWebEngineAccessibility::roles()
+void tst_Accessibility::roles()
 {
     QFETCH(QString, html);
     QFETCH(bool, isSection);
@@ -417,5 +417,5 @@ void tst_QWebEngineAccessibility::roles()
 static QByteArrayList params = QByteArrayList()
     << "--force-renderer-accessibility";
 
-W_QTEST_MAIN(tst_QWebEngineAccessibility, params)
-#include "tst_qwebengineaccessibility.moc"
+W_QTEST_MAIN(tst_Accessibility, params)
+#include "tst_accessibility.moc"
diff --git a/tests/auto/widgets/qwebenginedefaultsurfaceformat/qwebenginedefaultsurfaceformat.pro b/tests/auto/widgets/defaultsurfaceformat/defaultsurfaceformat.pro
index e99c7f493..e99c7f493 100644
--- a/tests/auto/widgets/qwebenginedefaultsurfaceformat/qwebenginedefaultsurfaceformat.pro
+++ b/tests/auto/widgets/defaultsurfaceformat/defaultsurfaceformat.pro
diff --git a/tests/auto/widgets/qwebenginedefaultsurfaceformat/resources/index.html b/tests/auto/widgets/defaultsurfaceformat/resources/index.html
index 53726e4a6..53726e4a6 100644
--- a/tests/auto/widgets/qwebenginedefaultsurfaceformat/resources/index.html
+++ b/tests/auto/widgets/defaultsurfaceformat/resources/index.html
diff --git a/tests/auto/widgets/qwebenginedefaultsurfaceformat/tst_qwebenginedefaultsurfaceformat.cpp b/tests/auto/widgets/defaultsurfaceformat/tst_defaultsurfaceformat.cpp
index 3ac8943a5..697ed3d08 100644
--- a/tests/auto/widgets/qwebenginedefaultsurfaceformat/tst_qwebenginedefaultsurfaceformat.cpp
+++ b/tests/auto/widgets/defaultsurfaceformat/tst_defaultsurfaceformat.cpp
@@ -69,4 +69,4 @@ void tst_QWebEngineDefaultSurfaceFormat::customDefaultSurfaceFormat()
 }
 
 QTEST_APPLESS_MAIN(tst_QWebEngineDefaultSurfaceFormat)
-#include "tst_qwebenginedefaultsurfaceformat.moc"
+#include "tst_defaultsurfaceformat.moc"
diff --git a/tests/auto/widgets/qwebenginedefaultsurfaceformat/tst_qwebenginedefaultsurfaceformat.qrc b/tests/auto/widgets/defaultsurfaceformat/tst_defaultsurfaceformat.qrc
index 3d5f1b3b2..3d5f1b3b2 100644
--- a/tests/auto/widgets/qwebenginedefaultsurfaceformat/tst_qwebenginedefaultsurfaceformat.qrc
+++ b/tests/auto/widgets/defaultsurfaceformat/tst_defaultsurfaceformat.qrc
diff --git a/tests/auto/widgets/qwebenginefaviconmanager/qwebenginefaviconmanager.pro b/tests/auto/widgets/faviconmanager/faviconmanager.pro
index e99c7f493..e99c7f493 100644
--- a/tests/auto/widgets/qwebenginefaviconmanager/qwebenginefaviconmanager.pro
+++ b/tests/auto/widgets/faviconmanager/faviconmanager.pro
diff --git a/tests/auto/widgets/qwebenginefaviconmanager/resources/favicon-misc.html b/tests/auto/widgets/faviconmanager/resources/favicon-misc.html
index 9e788bdf4..9e788bdf4 100644
--- a/tests/auto/widgets/qwebenginefaviconmanager/resources/favicon-misc.html
+++ b/tests/auto/widgets/faviconmanager/resources/favicon-misc.html
diff --git a/tests/auto/widgets/qwebenginefaviconmanager/resources/favicon-multi.html b/tests/auto/widgets/faviconmanager/resources/favicon-multi.html
index cc5f3fd66..cc5f3fd66 100644
--- a/tests/auto/widgets/qwebenginefaviconmanager/resources/favicon-multi.html
+++ b/tests/auto/widgets/faviconmanager/resources/favicon-multi.html
diff --git a/tests/auto/widgets/qwebenginefaviconmanager/resources/favicon-shortcut.html b/tests/auto/widgets/faviconmanager/resources/favicon-shortcut.html
index 786cdb816..786cdb816 100644
--- a/tests/auto/widgets/qwebenginefaviconmanager/resources/favicon-shortcut.html
+++ b/tests/auto/widgets/faviconmanager/resources/favicon-shortcut.html
diff --git a/tests/auto/widgets/qwebenginefaviconmanager/resources/favicon-single.html b/tests/auto/widgets/faviconmanager/resources/favicon-single.html
index eb4675c75..eb4675c75 100644
--- a/tests/auto/widgets/qwebenginefaviconmanager/resources/favicon-single.html
+++ b/tests/auto/widgets/faviconmanager/resources/favicon-single.html
diff --git a/tests/auto/widgets/qwebenginefaviconmanager/resources/favicon-touch.html b/tests/auto/widgets/faviconmanager/resources/favicon-touch.html
index 271783434..271783434 100644
--- a/tests/auto/widgets/qwebenginefaviconmanager/resources/favicon-touch.html
+++ b/tests/auto/widgets/faviconmanager/resources/favicon-touch.html
diff --git a/tests/auto/widgets/qwebenginefaviconmanager/resources/favicon-unavailable.html b/tests/auto/widgets/faviconmanager/resources/favicon-unavailable.html
index c45664294..c45664294 100644
--- a/tests/auto/widgets/qwebenginefaviconmanager/resources/favicon-unavailable.html
+++ b/tests/auto/widgets/faviconmanager/resources/favicon-unavailable.html
diff --git a/tests/auto/widgets/qwebenginefaviconmanager/resources/icons/qt144.png b/tests/auto/widgets/faviconmanager/resources/icons/qt144.png
index 050b1e066..050b1e066 100644
--- a/tests/auto/widgets/qwebenginefaviconmanager/resources/icons/qt144.png
+++ b/tests/auto/widgets/faviconmanager/resources/icons/qt144.png
diff --git a/tests/auto/widgets/qwebenginefaviconmanager/resources/icons/qt32.ico b/tests/auto/widgets/faviconmanager/resources/icons/qt32.ico
index 2f6fcb5bc..2f6fcb5bc 100644
--- a/tests/auto/widgets/qwebenginefaviconmanager/resources/icons/qt32.ico
+++ b/tests/auto/widgets/faviconmanager/resources/icons/qt32.ico
diff --git a/tests/auto/widgets/qwebenginefaviconmanager/resources/icons/qtmulti.ico b/tests/auto/widgets/faviconmanager/resources/icons/qtmulti.ico
index 81e5a22e8..81e5a22e8 100644
--- a/tests/auto/widgets/qwebenginefaviconmanager/resources/icons/qtmulti.ico
+++ b/tests/auto/widgets/faviconmanager/resources/icons/qtmulti.ico
diff --git a/tests/auto/widgets/qwebenginefaviconmanager/resources/test1.html b/tests/auto/widgets/faviconmanager/resources/test1.html
index b323f966e..b323f966e 100644
--- a/tests/auto/widgets/qwebenginefaviconmanager/resources/test1.html
+++ b/tests/auto/widgets/faviconmanager/resources/test1.html
diff --git a/tests/auto/widgets/qwebenginefaviconmanager/tst_qwebenginefaviconmanager.cpp b/tests/auto/widgets/faviconmanager/tst_faviconmanager.cpp
index 49984f987..14786e5b0 100644
--- a/tests/auto/widgets/qwebenginefaviconmanager/tst_qwebenginefaviconmanager.cpp
+++ b/tests/auto/widgets/faviconmanager/tst_faviconmanager.cpp
@@ -34,7 +34,7 @@
 #include <qwebengineview.h>
 
 
-class tst_QWebEngineFaviconManager : public QObject {
+class tst_FaviconManager : public QObject {
     Q_OBJECT
 
 public Q_SLOTS:
@@ -68,28 +68,28 @@ private:
 };
 
 
-void tst_QWebEngineFaviconManager::init()
+void tst_FaviconManager::init()
 {
     m_view = new QWebEngineView();
     m_page = m_view->page();
 }
 
 
-void tst_QWebEngineFaviconManager::initTestCase()
+void tst_FaviconManager::initTestCase()
 {
 }
 
-void tst_QWebEngineFaviconManager::cleanupTestCase()
+void tst_FaviconManager::cleanupTestCase()
 {
 }
 
 
-void tst_QWebEngineFaviconManager::cleanup()
+void tst_FaviconManager::cleanup()
 {
     delete m_view;
 }
 
-void tst_QWebEngineFaviconManager::faviconLoad()
+void tst_FaviconManager::faviconLoad()
 {
     if (!QDir(TESTS_SOURCE_DIR).exists())
         W_QSKIP(QString("This test requires access to resources found in '%1'").arg(TESTS_SOURCE_DIR).toLatin1().constData(), SkipAll);
@@ -98,7 +98,7 @@ void tst_QWebEngineFaviconManager::faviconLoad()
     QSignalSpy iconUrlChangedSpy(m_page, SIGNAL(iconUrlChanged(QUrl)));
     QSignalSpy iconChangedSpy(m_page, SIGNAL(iconChanged(QIcon)));
 
-    QUrl url = QUrl::fromLocalFile(TESTS_SOURCE_DIR + QLatin1String("qwebenginefaviconmanager/resources/favicon-single.html"));
+    QUrl url = QUrl::fromLocalFile(TESTS_SOURCE_DIR + QLatin1String("faviconmanager/resources/favicon-single.html"));
     m_page->load(url);
 
     QTRY_COMPARE(loadFinishedSpy.count(), 1);
@@ -107,7 +107,7 @@ void tst_QWebEngineFaviconManager::faviconLoad()
 
     QUrl iconUrl = iconUrlChangedSpy.at(0).at(0).toString();
     QCOMPARE(iconUrl, m_page->iconUrl());
-    QCOMPARE(iconUrl, QUrl::fromLocalFile(TESTS_SOURCE_DIR + QLatin1String("qwebenginefaviconmanager/resources/icons/qt32.ico")));
+    QCOMPARE(iconUrl, QUrl::fromLocalFile(TESTS_SOURCE_DIR + QLatin1String("faviconmanager/resources/icons/qt32.ico")));
 
     const QIcon &icon = m_page->icon();
     QVERIFY(!icon.isNull());
@@ -117,7 +117,7 @@ void tst_QWebEngineFaviconManager::faviconLoad()
     QCOMPARE(iconSize, QSize(32, 32));
 }
 
-void tst_QWebEngineFaviconManager::faviconLoadFromResources()
+void tst_FaviconManager::faviconLoadFromResources()
 {
     QSignalSpy loadFinishedSpy(m_page, SIGNAL(loadFinished(bool)));
     QSignalSpy iconUrlChangedSpy(m_page, SIGNAL(iconUrlChanged(QUrl)));
@@ -142,7 +142,7 @@ void tst_QWebEngineFaviconManager::faviconLoadFromResources()
     QCOMPARE(iconSize, QSize(32, 32));
 }
 
-void tst_QWebEngineFaviconManager::faviconLoadEncodedUrl()
+void tst_FaviconManager::faviconLoadEncodedUrl()
 {
     if (!QDir(TESTS_SOURCE_DIR).exists())
         W_QSKIP(QString("This test requires access to resources found in '%1'").arg(TESTS_SOURCE_DIR).toLatin1().constData(), SkipAll);
@@ -151,7 +151,7 @@ void tst_QWebEngineFaviconManager::faviconLoadEncodedUrl()
     QSignalSpy iconUrlChangedSpy(m_page, SIGNAL(iconUrlChanged(QUrl)));
     QSignalSpy iconChangedSpy(m_page, SIGNAL(iconChanged(QIcon)));
 
-    QString urlString = QUrl::fromLocalFile(TESTS_SOURCE_DIR + QLatin1String("qwebenginefaviconmanager/resources/favicon-single.html")).toString();
+    QString urlString = QUrl::fromLocalFile(TESTS_SOURCE_DIR + QLatin1String("faviconmanager/resources/favicon-single.html")).toString();
     QUrl url(urlString + QLatin1String("?favicon=load should work with#whitespace!"));
     m_page->load(url);
 
@@ -161,7 +161,7 @@ void tst_QWebEngineFaviconManager::faviconLoadEncodedUrl()
 
     QUrl iconUrl = iconUrlChangedSpy.at(0).at(0).toString();
     QCOMPARE(m_page->iconUrl(), iconUrl);
-    QCOMPARE(iconUrl, QUrl::fromLocalFile(TESTS_SOURCE_DIR + QLatin1String("qwebenginefaviconmanager/resources/icons/qt32.ico")));
+    QCOMPARE(iconUrl, QUrl::fromLocalFile(TESTS_SOURCE_DIR + QLatin1String("faviconmanager/resources/icons/qt32.ico")));
 
     const QIcon &icon = m_page->icon();
     QVERIFY(!icon.isNull());
@@ -171,7 +171,7 @@ void tst_QWebEngineFaviconManager::faviconLoadEncodedUrl()
     QCOMPARE(iconSize, QSize(32, 32));
 }
 
-void tst_QWebEngineFaviconManager::noFavicon()
+void tst_FaviconManager::noFavicon()
 {
     if (!QDir(TESTS_SOURCE_DIR).exists())
         W_QSKIP(QString("This test requires access to resources found in '%1'").arg(TESTS_SOURCE_DIR).toLatin1().constData(), SkipAll);
@@ -180,7 +180,7 @@ void tst_QWebEngineFaviconManager::noFavicon()
     QSignalSpy iconUrlChangedSpy(m_page, SIGNAL(iconUrlChanged(QUrl)));
     QSignalSpy iconChangedSpy(m_page, SIGNAL(iconChanged(QIcon)));
 
-    QUrl url = QUrl::fromLocalFile(TESTS_SOURCE_DIR + QLatin1String("qwebenginefaviconmanager/resources/test1.html"));
+    QUrl url = QUrl::fromLocalFile(TESTS_SOURCE_DIR + QLatin1String("faviconmanager/resources/test1.html"));
     m_page->load(url);
 
     QTRY_COMPARE(loadFinishedSpy.count(), 1);
@@ -191,7 +191,7 @@ void tst_QWebEngineFaviconManager::noFavicon()
     QVERIFY(m_page->icon().isNull());
 }
 
-void tst_QWebEngineFaviconManager::aboutBlank()
+void tst_FaviconManager::aboutBlank()
 {
     QSignalSpy loadFinishedSpy(m_page, SIGNAL(loadFinished(bool)));
     QSignalSpy iconUrlChangedSpy(m_page, SIGNAL(iconUrlChanged(QUrl)));
@@ -208,7 +208,7 @@ void tst_QWebEngineFaviconManager::aboutBlank()
     QVERIFY(m_page->icon().isNull());
 }
 
-void tst_QWebEngineFaviconManager::unavailableFavicon()
+void tst_FaviconManager::unavailableFavicon()
 {
     if (!QDir(TESTS_SOURCE_DIR).exists())
         W_QSKIP(QString("This test requires access to resources found in '%1'").arg(TESTS_SOURCE_DIR).toLatin1().constData(), SkipAll);
@@ -217,7 +217,7 @@ void tst_QWebEngineFaviconManager::unavailableFavicon()
     QSignalSpy iconUrlChangedSpy(m_page, SIGNAL(iconUrlChanged(QUrl)));
     QSignalSpy iconChangedSpy(m_page, SIGNAL(iconChanged(QIcon)));
 
-    QUrl url = QUrl::fromLocalFile(TESTS_SOURCE_DIR + QLatin1String("qwebenginefaviconmanager/resources/favicon-unavailable.html"));
+    QUrl url = QUrl::fromLocalFile(TESTS_SOURCE_DIR + QLatin1String("faviconmanager/resources/favicon-unavailable.html"));
     m_page->load(url);
 
     QTRY_COMPARE(loadFinishedSpy.count(), 1);
@@ -228,7 +228,7 @@ void tst_QWebEngineFaviconManager::unavailableFavicon()
     QVERIFY(m_page->icon().isNull());
 }
 
-void tst_QWebEngineFaviconManager::errorPageEnabled()
+void tst_FaviconManager::errorPageEnabled()
 {
     m_page->settings()->setAttribute(QWebEngineSettings::ErrorPageEnabled, true);
 
@@ -247,7 +247,7 @@ void tst_QWebEngineFaviconManager::errorPageEnabled()
     QVERIFY(m_page->icon().isNull());
 }
 
-void tst_QWebEngineFaviconManager::errorPageDisabled()
+void tst_FaviconManager::errorPageDisabled()
 {
     m_page->settings()->setAttribute(QWebEngineSettings::ErrorPageEnabled, false);
 
@@ -266,7 +266,7 @@ void tst_QWebEngineFaviconManager::errorPageDisabled()
     QVERIFY(m_page->icon().isNull());
 }
 
-void tst_QWebEngineFaviconManager::bestFavicon()
+void tst_FaviconManager::bestFavicon()
 {
     if (!QDir(TESTS_SOURCE_DIR).exists())
         W_QSKIP(QString("This test requires access to resources found in '%1'").arg(TESTS_SOURCE_DIR).toLatin1().constData(), SkipAll);
@@ -279,7 +279,7 @@ void tst_QWebEngineFaviconManager::bestFavicon()
     QIcon icon;
     QSize iconSize;
 
-    url = QUrl::fromLocalFile(TESTS_SOURCE_DIR + QLatin1String("qwebenginefaviconmanager/resources/favicon-misc.html"));
+    url = QUrl::fromLocalFile(TESTS_SOURCE_DIR + QLatin1String("faviconmanager/resources/favicon-misc.html"));
     m_page->load(url);
 
     QTRY_COMPARE(loadFinishedSpy.count(), 1);
@@ -289,7 +289,7 @@ void tst_QWebEngineFaviconManager::bestFavicon()
     iconUrl = iconUrlChangedSpy.at(0).at(0).toString();
     QCOMPARE(iconUrl, m_page->iconUrl());
     // Touch icon is ignored
-    QCOMPARE(iconUrl, QUrl::fromLocalFile(TESTS_SOURCE_DIR + QLatin1String("qwebenginefaviconmanager/resources/icons/qt32.ico")));
+    QCOMPARE(iconUrl, QUrl::fromLocalFile(TESTS_SOURCE_DIR + QLatin1String("faviconmanager/resources/icons/qt32.ico")));
 
     icon = m_page->icon();
     QVERIFY(!icon.isNull());
@@ -302,7 +302,7 @@ void tst_QWebEngineFaviconManager::bestFavicon()
     iconUrlChangedSpy.clear();
     iconChangedSpy.clear();
 
-    url = QUrl::fromLocalFile(TESTS_SOURCE_DIR + QLatin1String("qwebenginefaviconmanager/resources/favicon-shortcut.html"));
+    url = QUrl::fromLocalFile(TESTS_SOURCE_DIR + QLatin1String("faviconmanager/resources/favicon-shortcut.html"));
     m_page->load(url);
 
     QTRY_COMPARE(loadFinishedSpy.count(), 1);
@@ -320,7 +320,7 @@ void tst_QWebEngineFaviconManager::bestFavicon()
     }
 
     QCOMPARE(iconUrl, m_page->iconUrl());
-    QCOMPARE(iconUrl, QUrl::fromLocalFile(TESTS_SOURCE_DIR + QLatin1String("qwebenginefaviconmanager/resources/icons/qt144.png")));
+    QCOMPARE(iconUrl, QUrl::fromLocalFile(TESTS_SOURCE_DIR + QLatin1String("faviconmanager/resources/icons/qt144.png")));
 
     icon = m_page->icon();
     QVERIFY(!icon.isNull());
@@ -329,7 +329,7 @@ void tst_QWebEngineFaviconManager::bestFavicon()
     QVERIFY(icon.availableSizes().contains(QSize(144, 144)));
 }
 
-void tst_QWebEngineFaviconManager::touchIcon()
+void tst_FaviconManager::touchIcon()
 {
     if (!QDir(TESTS_SOURCE_DIR).exists())
         W_QSKIP(QString("This test requires access to resources found in '%1'").arg(TESTS_SOURCE_DIR).toLatin1().constData(), SkipAll);
@@ -338,7 +338,7 @@ void tst_QWebEngineFaviconManager::touchIcon()
     QSignalSpy iconUrlChangedSpy(m_page, SIGNAL(iconUrlChanged(QUrl)));
     QSignalSpy iconChangedSpy(m_page, SIGNAL(iconChanged(QIcon)));
 
-    QUrl url = QUrl::fromLocalFile(TESTS_SOURCE_DIR + QLatin1String("qwebenginefaviconmanager/resources/favicon-touch.html"));
+    QUrl url = QUrl::fromLocalFile(TESTS_SOURCE_DIR + QLatin1String("faviconmanager/resources/favicon-touch.html"));
     m_page->load(url);
 
     QTRY_COMPARE(loadFinishedSpy.count(), 1);
@@ -349,7 +349,7 @@ void tst_QWebEngineFaviconManager::touchIcon()
     QVERIFY(m_page->icon().isNull());
 }
 
-void tst_QWebEngineFaviconManager::multiIcon()
+void tst_FaviconManager::multiIcon()
 {
     if (!QDir(TESTS_SOURCE_DIR).exists())
         W_QSKIP(QString("This test requires access to resources found in '%1'").arg(TESTS_SOURCE_DIR).toLatin1().constData(), SkipAll);
@@ -358,7 +358,7 @@ void tst_QWebEngineFaviconManager::multiIcon()
     QSignalSpy iconUrlChangedSpy(m_page, SIGNAL(iconUrlChanged(QUrl)));
     QSignalSpy iconChangedSpy(m_page, SIGNAL(iconChanged(QIcon)));
 
-    QUrl url = QUrl::fromLocalFile(TESTS_SOURCE_DIR + QLatin1String("qwebenginefaviconmanager/resources/favicon-multi.html"));
+    QUrl url = QUrl::fromLocalFile(TESTS_SOURCE_DIR + QLatin1String("faviconmanager/resources/favicon-multi.html"));
     m_page->load(url);
 
     QTRY_COMPARE(loadFinishedSpy.count(), 1);
@@ -367,7 +367,7 @@ void tst_QWebEngineFaviconManager::multiIcon()
 
     QUrl iconUrl = iconUrlChangedSpy.at(0).at(0).toString();
     QCOMPARE(m_page->iconUrl(), iconUrl);
-    QCOMPARE(iconUrl, QUrl::fromLocalFile(TESTS_SOURCE_DIR + QLatin1String("qwebenginefaviconmanager/resources/icons/qtmulti.ico")));
+    QCOMPARE(iconUrl, QUrl::fromLocalFile(TESTS_SOURCE_DIR + QLatin1String("faviconmanager/resources/icons/qtmulti.ico")));
 
     const QIcon &icon = m_page->icon();
     QVERIFY(!icon.isNull());
@@ -377,7 +377,7 @@ void tst_QWebEngineFaviconManager::multiIcon()
     QVERIFY(icon.availableSizes().contains(QSize(64, 64)));
 }
 
-void tst_QWebEngineFaviconManager::candidateIcon()
+void tst_FaviconManager::candidateIcon()
 {
     if (!QDir(TESTS_SOURCE_DIR).exists())
         W_QSKIP(QString("This test requires access to resources found in '%1'").arg(TESTS_SOURCE_DIR).toLatin1().constData(), SkipAll);
@@ -386,7 +386,7 @@ void tst_QWebEngineFaviconManager::candidateIcon()
     QSignalSpy iconUrlChangedSpy(m_page, SIGNAL(iconUrlChanged(QUrl)));
     QSignalSpy iconChangedSpy(m_page, SIGNAL(iconChanged(QIcon)));
 
-    QUrl url = QUrl::fromLocalFile(TESTS_SOURCE_DIR + QLatin1String("qwebenginefaviconmanager/resources/favicon-shortcut.html"));
+    QUrl url = QUrl::fromLocalFile(TESTS_SOURCE_DIR + QLatin1String("faviconmanager/resources/favicon-shortcut.html"));
     m_page->load(url);
 
     QTRY_COMPARE(loadFinishedSpy.count(), 1);
@@ -395,7 +395,7 @@ void tst_QWebEngineFaviconManager::candidateIcon()
 
     QUrl iconUrl = iconUrlChangedSpy.at(0).at(0).toString();
     QCOMPARE(m_page->iconUrl(), iconUrl);
-    QCOMPARE(iconUrl, QUrl::fromLocalFile(TESTS_SOURCE_DIR + QLatin1String("qwebenginefaviconmanager/resources/icons/qt144.png")));
+    QCOMPARE(iconUrl, QUrl::fromLocalFile(TESTS_SOURCE_DIR + QLatin1String("faviconmanager/resources/icons/qt144.png")));
 
     const QIcon &icon = m_page->icon();
     QVERIFY(!icon.isNull());
@@ -404,7 +404,7 @@ void tst_QWebEngineFaviconManager::candidateIcon()
     QVERIFY(icon.availableSizes().contains(QSize(144, 144)));
 }
 
-void tst_QWebEngineFaviconManager::downloadIconsDisabled_data()
+void tst_FaviconManager::downloadIconsDisabled_data()
 {
     QTest::addColumn<QUrl>("url");
     QTest::newRow("misc") << QUrl("qrc:/resources/favicon-misc.html");
@@ -414,7 +414,7 @@ void tst_QWebEngineFaviconManager::downloadIconsDisabled_data()
     QTest::newRow("unavailable") << QUrl("qrc:/resources/favicon-unavailable.html");
 }
 
-void tst_QWebEngineFaviconManager::downloadIconsDisabled()
+void tst_FaviconManager::downloadIconsDisabled()
 {
     QFETCH(QUrl, url);
 
@@ -434,7 +434,7 @@ void tst_QWebEngineFaviconManager::downloadIconsDisabled()
     QVERIFY(m_page->icon().isNull());
 }
 
-void tst_QWebEngineFaviconManager::downloadTouchIconsEnabled_data()
+void tst_FaviconManager::downloadTouchIconsEnabled_data()
 {
     QTest::addColumn<QUrl>("url");
     QTest::addColumn<QUrl>("expectedIconUrl");
@@ -445,7 +445,7 @@ void tst_QWebEngineFaviconManager::downloadTouchIconsEnabled_data()
     QTest::newRow("touch") << QUrl("qrc:/resources/favicon-touch.html") << QUrl("qrc:/resources/icons/qt144.png") << QSize(144, 144);
 }
 
-void tst_QWebEngineFaviconManager::downloadTouchIconsEnabled()
+void tst_FaviconManager::downloadTouchIconsEnabled()
 {
     QFETCH(QUrl, url);
     QFETCH(QUrl, expectedIconUrl);
@@ -474,7 +474,7 @@ void tst_QWebEngineFaviconManager::downloadTouchIconsEnabled()
     QVERIFY(icon.availableSizes().contains(expectedIconSize));
 }
 
-void tst_QWebEngineFaviconManager::dynamicFavicon()
+void tst_FaviconManager::dynamicFavicon()
 {
     QSignalSpy loadFinishedSpy(m_page, SIGNAL(loadFinished(bool)));
     QSignalSpy iconUrlChangedSpy(m_page, SIGNAL(iconUrlChanged(QUrl)));
@@ -503,6 +503,6 @@ void tst_QWebEngineFaviconManager::dynamicFavicon()
     }
 }
 
-QTEST_MAIN(tst_QWebEngineFaviconManager)
+QTEST_MAIN(tst_FaviconManager)
 
-#include "tst_qwebenginefaviconmanager.moc"
+#include "tst_faviconmanager.moc"
diff --git a/tests/auto/widgets/qwebenginefaviconmanager/tst_qwebenginefaviconmanager.qrc b/tests/auto/widgets/faviconmanager/tst_faviconmanager.qrc
index a352f8a83..a352f8a83 100644
--- a/tests/auto/widgets/qwebenginefaviconmanager/tst_qwebenginefaviconmanager.qrc
+++ b/tests/auto/widgets/faviconmanager/tst_faviconmanager.qrc
diff --git a/tests/auto/widgets/qwebenginedownloads/qwebenginedownloads.pro b/tests/auto/widgets/qwebenginedownloaditem/qwebenginedownloaditem.pro
index 18a66c466..18a66c466 100644
--- a/tests/auto/widgets/qwebenginedownloads/qwebenginedownloads.pro
+++ b/tests/auto/widgets/qwebenginedownloaditem/qwebenginedownloaditem.pro
diff --git a/tests/auto/widgets/qwebenginedownloads/tst_qwebenginedownloads.cpp b/tests/auto/widgets/qwebenginedownloaditem/tst_qwebenginedownloaditem.cpp
index 8d965d998..31b66ebe2 100644
--- a/tests/auto/widgets/qwebenginedownloads/tst_qwebenginedownloads.cpp
+++ b/tests/auto/widgets/qwebenginedownloaditem/tst_qwebenginedownloaditem.cpp
@@ -37,7 +37,7 @@
 #include <QWebEngineView>
 #include <httpserver.h>
 
-class tst_QWebEngineDownloads : public QObject
+class tst_QWebEngineDownloadItem : public QObject
 {
     Q_OBJECT
 
@@ -92,10 +92,10 @@ private:
     QMetaObject::Connection m_connection;
 };
 
-Q_DECLARE_METATYPE(tst_QWebEngineDownloads::UserAction)
-Q_DECLARE_METATYPE(tst_QWebEngineDownloads::FileAction)
+Q_DECLARE_METATYPE(tst_QWebEngineDownloadItem::UserAction)
+Q_DECLARE_METATYPE(tst_QWebEngineDownloadItem::FileAction)
 
-void tst_QWebEngineDownloads::initTestCase()
+void tst_QWebEngineDownloadItem::initTestCase()
 {
     m_server = new HttpServer();
     m_profile = new QWebEngineProfile;
@@ -116,18 +116,18 @@ void tst_QWebEngineDownloads::initTestCase()
     m_view->show();
 }
 
-void tst_QWebEngineDownloads::init()
+void tst_QWebEngineDownloadItem::init()
 {
     QVERIFY(m_server->start());
 }
 
-void tst_QWebEngineDownloads::cleanup()
+void tst_QWebEngineDownloadItem::cleanup()
 {
     QCOMPARE(m_downloads.count(), 0);
     QVERIFY(m_server->stop());
 }
 
-void tst_QWebEngineDownloads::cleanupTestCase()
+void tst_QWebEngineDownloadItem::cleanupTestCase()
 {
     delete m_view;
     delete m_page;
@@ -135,7 +135,7 @@ void tst_QWebEngineDownloads::cleanupTestCase()
     delete m_server;
 }
 
-void tst_QWebEngineDownloads::saveLink(QPoint linkPos)
+void tst_QWebEngineDownloadItem::saveLink(QPoint linkPos)
 {
     // Simulate right-clicking on link and choosing "save link as" from menu.
     QSignalSpy menuSpy(m_view, &QWebEngineView::customContextMenuRequested);
@@ -152,7 +152,7 @@ void tst_QWebEngineDownloads::saveLink(QPoint linkPos)
     m_page->triggerAction(QWebEnginePage::DownloadLinkToDisk);
 }
 
-void tst_QWebEngineDownloads::clickLink(QPoint linkPos)
+void tst_QWebEngineDownloadItem::clickLink(QPoint linkPos)
 {
     // Simulate left-clicking on link.
     QTRY_VERIFY(m_view->focusWidget());
@@ -160,7 +160,7 @@ void tst_QWebEngineDownloads::clickLink(QPoint linkPos)
     QTest::mouseClick(renderWidget, Qt::LeftButton, {}, linkPos);
 }
 
-void tst_QWebEngineDownloads::simulateUserAction(QPoint linkPos, UserAction action)
+void tst_QWebEngineDownloadItem::simulateUserAction(QPoint linkPos, UserAction action)
 {
     switch (action) {
     case SaveLink: return saveLink(linkPos);
@@ -168,7 +168,7 @@ void tst_QWebEngineDownloads::simulateUserAction(QPoint linkPos, UserAction acti
     }
 }
 
-QWebEngineDownloadItem::DownloadType tst_QWebEngineDownloads::expectedDownloadType(
+QWebEngineDownloadItem::DownloadType tst_QWebEngineDownloadItem::expectedDownloadType(
     UserAction userAction, const QByteArray &contentDisposition)
 {
     if (userAction == SaveLink)
@@ -178,7 +178,7 @@ QWebEngineDownloadItem::DownloadType tst_QWebEngineDownloads::expectedDownloadTy
     return QWebEngineDownloadItem::DownloadAttribute;
 }
 
-void tst_QWebEngineDownloads::downloadLink_data()
+void tst_QWebEngineDownloadItem::downloadLink_data()
 {
     QTest::addColumn<UserAction>("userAction");
     QTest::addColumn<bool>("anchorHasDownloadAttribute");
@@ -375,7 +375,7 @@ void tst_QWebEngineDownloads::downloadLink_data()
         /* fileAction                 */ << FileIsDownloaded;
 }
 
-void tst_QWebEngineDownloads::downloadLink()
+void tst_QWebEngineDownloadItem::downloadLink()
 {
     QFETCH(UserAction, userAction);
     QFETCH(bool, anchorHasDownloadAttribute);
@@ -498,7 +498,7 @@ void tst_QWebEngineDownloads::downloadLink()
     QCOMPARE(file.readAll(), fileContents);
 }
 
-void tst_QWebEngineDownloads::downloadTwoLinks_data()
+void tst_QWebEngineDownloadItem::downloadTwoLinks_data()
 {
     QTest::addColumn<UserAction>("action1");
     QTest::addColumn<UserAction>("action2");
@@ -508,7 +508,7 @@ void tst_QWebEngineDownloads::downloadTwoLinks_data()
     QTest::newRow("Click+Click") << ClickLink << ClickLink;
 }
 
-void tst_QWebEngineDownloads::downloadTwoLinks()
+void tst_QWebEngineDownloadItem::downloadTwoLinks()
 {
     QFETCH(UserAction, action1);
     QFETCH(UserAction, action2);
@@ -590,7 +590,7 @@ void tst_QWebEngineDownloads::downloadTwoLinks()
     QTRY_COMPARE(finishedCount, 2);
 }
 
-void tst_QWebEngineDownloads::downloadPage_data()
+void tst_QWebEngineDownloadItem::downloadPage_data()
 {
     QTest::addColumn<QWebEngineDownloadItem::SavePageFormat>("savePageFormat");
     QTest::newRow("SingleHtmlSaveFormat") << QWebEngineDownloadItem::SingleHtmlSaveFormat;
@@ -598,7 +598,7 @@ void tst_QWebEngineDownloads::downloadPage_data()
     QTest::newRow("MimeHtmlSaveFormat") << QWebEngineDownloadItem::MimeHtmlSaveFormat;
 }
 
-void tst_QWebEngineDownloads::downloadPage()
+void tst_QWebEngineDownloadItem::downloadPage()
 {
     QFETCH(QWebEngineDownloadItem::SavePageFormat, savePageFormat);
 
@@ -672,7 +672,7 @@ void tst_QWebEngineDownloads::downloadPage()
     QVERIFY(file.exists());
 }
 
-void tst_QWebEngineDownloads::downloadViaSetUrl()
+void tst_QWebEngineDownloadItem::downloadViaSetUrl()
 {
     // Reproduce the scenario described in QTBUG-63388 by triggering downloads
     // of the same file multiple times via QWebEnginePage::setUrl
@@ -726,7 +726,7 @@ void tst_QWebEngineDownloads::downloadViaSetUrl()
     }
 }
 
-void tst_QWebEngineDownloads::downloadFileNot1()
+void tst_QWebEngineDownloadItem::downloadFileNot1()
 {
     // Trigger file download via download() but don't accept().
 
@@ -749,7 +749,7 @@ void tst_QWebEngineDownloads::downloadFileNot1()
     QVERIFY(!downloadItem);
 }
 
-void tst_QWebEngineDownloads::downloadFileNot2()
+void tst_QWebEngineDownloadItem::downloadFileNot2()
 {
     // Trigger file download via download() but call cancel() instead of accept().
 
@@ -774,5 +774,5 @@ void tst_QWebEngineDownloads::downloadFileNot2()
     QCOMPARE(downloadItem->state(), QWebEngineDownloadItem::DownloadCancelled);
 }
 
-QTEST_MAIN(tst_QWebEngineDownloads)
-#include "tst_qwebenginedownloads.moc"
+QTEST_MAIN(tst_QWebEngineDownloadItem)
+#include "tst_qwebenginedownloaditem.moc"
diff --git a/tests/auto/widgets/qwebengineschemes/BLACKLIST b/tests/auto/widgets/schemes/BLACKLIST
index e69de29bb..e69de29bb 100644
--- a/tests/auto/widgets/qwebengineschemes/BLACKLIST
+++ b/tests/auto/widgets/schemes/BLACKLIST
diff --git a/tests/auto/widgets/qwebengineschemes/qwebengineschemes.pro b/tests/auto/widgets/schemes/schemes.pro
index e56bbe8f7..e56bbe8f7 100644
--- a/tests/auto/widgets/qwebengineschemes/qwebengineschemes.pro
+++ b/tests/auto/widgets/schemes/schemes.pro
diff --git a/tests/auto/widgets/qwebengineschemes/tst_qwebengineschemes.cpp b/tests/auto/widgets/schemes/tst_schemes.cpp
index 9381b3930..2097120ef 100644
--- a/tests/auto/widgets/qwebengineschemes/tst_qwebengineschemes.cpp
+++ b/tests/auto/widgets/schemes/tst_schemes.cpp
@@ -33,7 +33,7 @@
 #include <qwebengineprofile.h>
 #include <qwebenginesettings.h>
 
-class tst_QWebEngineSchemes : public QObject
+class tst_Schemes : public QObject
 {
     Q_OBJECT
 
@@ -58,7 +58,7 @@ public:
     }
 };
 
-void tst_QWebEngineSchemes::unknownUrlSchemePolicy()
+void tst_Schemes::unknownUrlSchemePolicy()
 {
     QWebEngineView view;
     AcceptNavigationRequestHandler page;
@@ -109,5 +109,5 @@ void tst_QWebEngineSchemes::unknownUrlSchemePolicy()
     }
 }
 
-QTEST_MAIN(tst_QWebEngineSchemes)
-#include "tst_qwebengineschemes.moc"
+QTEST_MAIN(tst_Schemes)
+#include "tst_schemes.moc"
diff --git a/tests/auto/widgets/qwebengineshutdown/qwebengineshutdown.pro b/tests/auto/widgets/shutdown/shutdown.pro
index e99c7f493..e99c7f493 100644
--- a/tests/auto/widgets/qwebengineshutdown/qwebengineshutdown.pro
+++ b/tests/auto/widgets/shutdown/shutdown.pro
diff --git a/tests/auto/widgets/qwebengineshutdown/tst_qwebengineshutdown.cpp b/tests/auto/widgets/shutdown/tst_shutdown.cpp
index d757e0d60..5c1e426d2 100644
--- a/tests/auto/widgets/qwebengineshutdown/tst_qwebengineshutdown.cpp
+++ b/tests/auto/widgets/shutdown/tst_shutdown.cpp
@@ -44,13 +44,13 @@
 #include <qwebengineview.h>
 #include <QDebug>
 
-class tst_QWebEngineShutdown : public QObject
+class tst_Shutdown : public QObject
 {
     Q_OBJECT
 
 public:
-    tst_QWebEngineShutdown();
-    virtual ~tst_QWebEngineShutdown();
+    tst_Shutdown();
+    virtual ~tst_Shutdown();
 
 public Q_SLOTS:
     void init();
@@ -67,29 +67,29 @@ private:
     QWebEnginePage* m_page;
 };
 
-tst_QWebEngineShutdown::tst_QWebEngineShutdown()
+tst_Shutdown::tst_Shutdown()
 {
 }
 
-tst_QWebEngineShutdown::~tst_QWebEngineShutdown()
+tst_Shutdown::~tst_Shutdown()
 {
 }
 
-void tst_QWebEngineShutdown::init()
+void tst_Shutdown::init()
 {
     m_view = new QWebEngineView();
     m_page = m_view->page();
 }
 
-void tst_QWebEngineShutdown::cleanup()
+void tst_Shutdown::cleanup()
 {
     delete m_view;
 }
 
-void tst_QWebEngineShutdown::dummyTest()
+void tst_Shutdown::dummyTest()
 {
     QVERIFY(m_view);
 }
 
-QTEST_MAIN(tst_QWebEngineShutdown)
-#include "tst_qwebengineshutdown.moc"
+QTEST_MAIN(tst_Shutdown)
+#include "tst_shutdown.moc"
diff --git a/tests/auto/widgets/qwebenginespellcheck/dict/de-DE.aff b/tests/auto/widgets/spellchecking/dict/de-DE.aff
index ff8185771..ff8185771 100644
--- a/tests/auto/widgets/qwebenginespellcheck/dict/de-DE.aff
+++ b/tests/auto/widgets/spellchecking/dict/de-DE.aff
diff --git a/tests/auto/widgets/qwebenginespellcheck/dict/de-DE.dic b/tests/auto/widgets/spellchecking/dict/de-DE.dic
index a57ab15b4..a57ab15b4 100644
--- a/tests/auto/widgets/qwebenginespellcheck/dict/de-DE.dic
+++ b/tests/auto/widgets/spellchecking/dict/de-DE.dic
diff --git a/tests/auto/widgets/qwebenginespellcheck/dict/en-US.aff b/tests/auto/widgets/spellchecking/dict/en-US.aff
index ff8185771..ff8185771 100644
--- a/tests/auto/widgets/qwebenginespellcheck/dict/en-US.aff
+++ b/tests/auto/widgets/spellchecking/dict/en-US.aff
diff --git a/tests/auto/widgets/qwebenginespellcheck/dict/en-US.dic b/tests/auto/widgets/spellchecking/dict/en-US.dic
index 63e9164cc..63e9164cc 100644
--- a/tests/auto/widgets/qwebenginespellcheck/dict/en-US.dic
+++ b/tests/auto/widgets/spellchecking/dict/en-US.dic
diff --git a/tests/auto/widgets/qwebenginespellcheck/resources/index.html b/tests/auto/widgets/spellchecking/resources/index.html
index 520979244..520979244 100644
--- a/tests/auto/widgets/qwebenginespellcheck/resources/index.html
+++ b/tests/auto/widgets/spellchecking/resources/index.html
diff --git a/tests/auto/widgets/qwebenginespellcheck/qwebenginespellcheck.pro b/tests/auto/widgets/spellchecking/spellchecking.pro
index a36c82e20..a36c82e20 100644
--- a/tests/auto/widgets/qwebenginespellcheck/qwebenginespellcheck.pro
+++ b/tests/auto/widgets/spellchecking/spellchecking.pro
diff --git a/tests/auto/widgets/qwebenginespellcheck/tst_qwebenginespellcheck.cpp b/tests/auto/widgets/spellchecking/tst_spellchecking.cpp
index 0dec6d72f..b6582083d 100644
--- a/tests/auto/widgets/qwebenginespellcheck/tst_qwebenginespellcheck.cpp
+++ b/tests/auto/widgets/spellchecking/tst_spellchecking.cpp
@@ -65,7 +65,7 @@ private:
     QWebEngineContextMenuData m_data;
 };
 
-class tst_QWebEngineSpellcheck : public QObject
+class tst_Spellchecking : public QObject
 {
     Q_OBJECT
 
@@ -84,7 +84,7 @@ private:
     WebView *m_view;
 };
 
-void tst_QWebEngineSpellcheck::initTestCase()
+void tst_Spellchecking::initTestCase()
 {
     QWebEngineProfile *profile = QWebEngineProfile::defaultProfile();
     QVERIFY(profile);
@@ -92,7 +92,7 @@ void tst_QWebEngineSpellcheck::initTestCase()
     QVERIFY(profile->spellCheckLanguages().isEmpty());
 }
 
-void tst_QWebEngineSpellcheck::init()
+void tst_Spellchecking::init()
 {
     QWebEngineProfile *profile = QWebEngineProfile::defaultProfile();
     profile->setSpellCheckEnabled(false);
@@ -100,7 +100,7 @@ void tst_QWebEngineSpellcheck::init()
     m_view = new WebView();
 }
 
-void tst_QWebEngineSpellcheck::load()
+void tst_Spellchecking::load()
 {
     m_view->page()->load(QUrl("qrc:///resources/index.html"));
     m_view->show();
@@ -109,12 +109,12 @@ void tst_QWebEngineSpellcheck::load()
 
 }
 
-void tst_QWebEngineSpellcheck::cleanup()
+void tst_Spellchecking::cleanup()
 {
     delete m_view;
 }
 
-void tst_QWebEngineSpellcheck::spellCheckLanguage()
+void tst_Spellchecking::spellCheckLanguage()
 {
     QWebEngineProfile *profile = QWebEngineProfile::defaultProfile();
     QVERIFY(profile);
@@ -122,7 +122,7 @@ void tst_QWebEngineSpellcheck::spellCheckLanguage()
     QVERIFY(profile->spellCheckLanguages() == QStringList({"en-US"}));
 }
 
-void tst_QWebEngineSpellcheck::spellCheckLanguages()
+void tst_Spellchecking::spellCheckLanguages()
 {
     QWebEngineProfile *profile = QWebEngineProfile::defaultProfile();
     QVERIFY(profile);
@@ -131,7 +131,7 @@ void tst_QWebEngineSpellcheck::spellCheckLanguages()
 }
 
 
-void tst_QWebEngineSpellcheck::spellCheckEnabled()
+void tst_Spellchecking::spellCheckEnabled()
 {
     QWebEngineProfile *profile = QWebEngineProfile::defaultProfile();
     QVERIFY(profile);
@@ -139,7 +139,7 @@ void tst_QWebEngineSpellcheck::spellCheckEnabled()
     QVERIFY(profile->isSpellCheckEnabled());
 }
 
-void tst_QWebEngineSpellcheck::spellcheck()
+void tst_Spellchecking::spellcheck()
 {
     QFETCH(QStringList, languages);
     QFETCH(QStringList, suggestions);
@@ -195,7 +195,7 @@ void tst_QWebEngineSpellcheck::spellcheck()
     QTRY_VERIFY(evaluateJavaScriptSync(m_view->page(), "text();").toString() == text);
 }
 
-void tst_QWebEngineSpellcheck::spellcheck_data()
+void tst_Spellchecking::spellcheck_data()
 {
     QTest::addColumn<QStringList>("languages");
     QTest::addColumn<QStringList>("suggestions");
@@ -203,5 +203,5 @@ void tst_QWebEngineSpellcheck::spellcheck_data()
     QTest::newRow("en-US,de-DE") << QStringList({"en-US", "de-DE"}) << QStringList({"löwe", "low", "love"});
 }
 
-QTEST_MAIN(tst_QWebEngineSpellcheck)
-#include "tst_qwebenginespellcheck.moc"
+QTEST_MAIN(tst_Spellchecking)
+#include "tst_spellchecking.moc"
diff --git a/tests/auto/widgets/qwebenginespellcheck/tst_qwebenginespellcheck.qrc b/tests/auto/widgets/spellchecking/tst_spellchecking.qrc
index 505b932c7..505b932c7 100644
--- a/tests/auto/widgets/qwebenginespellcheck/tst_qwebenginespellcheck.qrc
+++ b/tests/auto/widgets/spellchecking/tst_spellchecking.qrc
diff --git a/tests/auto/widgets/tests.pri b/tests/auto/widgets/tests.pri
index 7fd002235..97954aedc 100644
--- a/tests/auto/widgets/tests.pri
+++ b/tests/auto/widgets/tests.pri
@@ -4,7 +4,7 @@ QT_FOR_CONFIG += webenginecore-private
 TEMPLATE = app
 
 CONFIG += testcase
-CONFIG += c++11
+CONFIG += c++14
 
 VPATH += $$_PRO_FILE_PWD_
 TARGET = tst_$$TARGET
diff --git a/tests/auto/widgets/widgets.pro b/tests/auto/widgets/widgets.pro
index faafeb69f..517a60566 100644
--- a/tests/auto/widgets/widgets.pro
+++ b/tests/auto/widgets/widgets.pro
@@ -4,23 +4,23 @@ QT_FOR_CONFIG += webenginecore webenginecore-private
 TEMPLATE = subdirs
 
 SUBDIRS += \
-    origins \
+    defaultsurfaceformat \
+    faviconmanager \
     loadsignals \
-    qwebenginedefaultsurfaceformat \
-    qwebenginedownloads \
-    qwebenginefaviconmanager \
+    origins \
+    schemes \
+    shutdown \
+    qwebenginedownloaditem \
     qwebenginepage \
     qwebenginehistory \
     qwebengineinspector \
     qwebengineprofile \
-    qwebengineschemes \
     qwebenginescript \
     qwebenginesettings \
-    qwebengineshutdown \
     qwebengineview
 
 qtConfig(accessibility) {
-    SUBDIRS += qwebengineaccessibility
+    SUBDIRS += accessibility
 }
 
 qtConfig(webengine-printing-and-pdf) {
@@ -29,15 +29,15 @@ qtConfig(webengine-printing-and-pdf) {
 
 qtConfig(webengine-spellchecker):!cross_compile {
     !qtConfig(webengine-native-spellchecker) {
-        SUBDIRS += qwebenginespellcheck
+        SUBDIRS += spellchecking
     } else {
         message("Spellcheck test will not be built because it depends on usage of Hunspell dictionaries.")
     }
 }
 
 # QTBUG-60268
-boot2qt: SUBDIRS -= qwebengineaccessibility qwebenginedefaultsurfaceformat \
-                    qwebenginefaviconmanager qwebenginepage qwebenginehistory \
-                    qwebengineprofile qwebengineschemes qwebenginescript \
-                    qwebengineview qwebenginedownloads qwebenginesettings \
-                    origins loadsignals
+boot2qt: SUBDIRS -= accessibility defaultsurfaceformat \
+                    faviconmanager qwebenginepage qwebenginehistory \
+                    qwebengineprofile qwebenginescript \
+                    qwebengineview qwebenginedownloaditem qwebenginesettings \
+                    schemes origins loadsignals
author	Allan Sandfeld Jensen <allan.jensen@qt.io>	2018-07-19 14:03:21 +0200
committer	Allan Sandfeld Jensen <allan.jensen@qt.io>	2018-07-23 16:22:41 +0000
commit	a6a42cf01681bda5ad7f97d65f6108534ab7745e (patch)
tree	5fc125cbb711b089fbe69995c4773baeeebe7d2f
parent	68ff88a1d767a64dd8d9b90615567789feebcefe (diff)