Support compile-time style selection

By allowing importing styles without first importing QtQuick.Controls,
which does runtime style selection.

[ChangeLog][Styles] It's now possible to select a style at compile-time
by importing that style explicitly instead of QtQuick.Controls. This
avoids the need to do run-time style selection and hence deploy the
QtQuick.Controls plugin with the application.

Change-Id: I666d6dc7727fffd2c7b05743855f2086f076465a
Fixes: QTBUG-86284
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>

1 files changed, 7 insertions, 3 deletions

diff --git a/tests/auto/shared/visualtestutil.h b/tests/auto/shared/visualtestutil.h
index cbc0bade..78c625ea 100644
--- a/tests/auto/shared/visualtestutil.h
+++ b/tests/auto/shared/visualtestutil.h
@@ -118,9 +118,14 @@ namespace QQuickVisualTestUtil
     class QQuickApplicationHelper
     {
     public:
-        QQuickApplicationHelper(QQmlDataTest *testCase, const QString &testFilePath) :
-            component(&engine)
+        QQuickApplicationHelper(QQmlDataTest *testCase, const QString &testFilePath,
+                const QStringList &qmlImportPaths = QStringList())
         {
+            for (const auto &path : qmlImportPaths)
+                engine.addImportPath(path);
+
+            QQmlComponent component(&engine);
+
             component.loadUrl(testCase->testFileUrl(testFilePath));
             QObject *rootObject = component.create();
             cleanup.reset(rootObject);
@@ -152,7 +157,6 @@ namespace QQuickVisualTestUtil
         }
 
         QQmlEngine engine;
-        QQmlComponent component;
         QScopedPointer<QObject> cleanup;
         QQuickApplicationWindow *appWindow = nullptr;
         QQuickWindow *window = nullptr;