Remove Quick Controls 1 UIDelegates and introduce UIDelegates test

- Renamed Controls2Delegates to ControlsDelegates
- Removed option to use Quick Controls 1 delegates
- Added test to check if controls are shown

Task-number: QTBUG-93666
Change-Id: Iccca948615309285db7fc57d14fb1cdcdef28051
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
(cherry picked from commit 4fe808a8c0ecd143199781e9644a46e4b1b90653)
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 6 insertions, 12 deletions

diff --git a/src/webenginequick/ui_delegates_manager.cpp b/src/webenginequick/ui_delegates_manager.cpp
index 756b3429e..02f0f124f 100644
--- a/src/webenginequick/ui_delegates_manager.cpp
+++ b/src/webenginequick/ui_delegates_manager.cpp
@@ -658,22 +658,16 @@ bool UI2DelegatesManager::initializeImportDirs(QStringList &dirs, QQmlEngine *en
 {
     const QStringList paths = engine->importPathList();
     for (const QString &path : paths) {
-        QString controls2ImportPath = path % QLatin1String("/QtWebEngine/Controls2Delegates/");
-        QString controls1ImportPath = path % QLatin1String("/QtWebEngine/Controls1Delegates/");
+        QString controlsImportPath = path % QLatin1String("/QtWebEngine/ControlsDelegates/");
 
         // resource paths have to be tested using the ":/" prefix
-        if (controls2ImportPath.startsWith(QLatin1String("qrc:/"))) {
-            controls2ImportPath.remove(0, 3);
-            controls1ImportPath.remove(0, 3);
+        if (controlsImportPath.startsWith(QLatin1String("qrc:/"))) {
+            controlsImportPath.remove(0, 3);
         }
 
-        QFileInfo fi2(controls2ImportPath);
-        if (fi2.exists())
-            dirs << fi2.absolutePath();
-
-        QFileInfo fi1(controls1ImportPath);
-        if (fi1.exists())
-            dirs << fi1.absolutePath();
+        QFileInfo fi(controlsImportPath);
+        if (fi.exists())
+            dirs << fi.absolutePath();
     }
     return !dirs.isEmpty();
 }