Look for styles in all import paths.

The assumption that the QML import path is always last fails for the deployed
case, in which the imports are directory under the binaries.

Task-number: QTBUG-50730
Change-Id: Iea8b73d78375b6d211095fcb8ecc00e2127f4884
Reviewed-by: Mitch Curtis <mitch.curtis@theqtcompany.com>

1 files changed, 11 insertions, 4 deletions

diff --git a/src/virtualkeyboard/virtualkeyboardsettings.cpp b/src/virtualkeyboard/virtualkeyboardsettings.cpp
index 623034f2..2703d5f6 100644
--- a/src/virtualkeyboard/virtualkeyboardsettings.cpp
+++ b/src/virtualkeyboard/virtualkeyboardsettings.cpp
@@ -58,10 +58,17 @@ public:
     {
         QStringList styleImportPathList;
         styleImportPathList << "qrc:/QtQuick/Enterprise/VirtualKeyboard/content/styles/";
-        QStringList importPathList = engine->importPathList();
-        // Add QML import path (Note: the QML base dir is always the last entry in the list)
-        if (!importPathList.isEmpty())
-            styleImportPathList << importPathList.last() + "/QtQuick/Enterprise/VirtualKeyboard/Styles/";
+        const QStringList importPathList = engine->importPathList();
+        // Add QML import path (Note: the QML base dir is usually the last entry in the list)
+        for (int i = importPathList.size() - 1; i >= 0; --i) {
+            const QString stylesPath = importPathList.at(i)
+                + QStringLiteral("/QtQuick/Enterprise/VirtualKeyboard/Styles/");
+            if (QFileInfo(stylesPath).isDir()) {
+                styleImportPathList += stylesPath;
+                break;
+            }
+        }
+
         foreach (const QString &styleImportPath, styleImportPathList) {
             QString filePath = buildStyleFilePath(styleImportPath, name);
             bool pathExist = false;