From d52a10eccd6fd7fae7481330e816975ba2b64f91 Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@qt.io>
Date: Wed, 10 Jun 2020 12:36:31 +0200
Subject: QQmlImport: Parse resource paths from QML2_IMPORT_PATH

We can interpret double colons as start of resource paths.

Task-number: QTBUG-69435
Change-Id: If2b4412c28c7c59f160ddfcfe04ec293af437660
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
---
 tests/auto/qml/qqmlimport/tst_qqmlimport.cpp | 29 ++++++++++++++++++++++++++++
 1 file changed, 29 insertions(+)

(limited to 'tests')

diff --git a/tests/auto/qml/qqmlimport/tst_qqmlimport.cpp b/tests/auto/qml/qqmlimport/tst_qqmlimport.cpp
index 0fdec44cdf..316c4cb168 100644
--- a/tests/auto/qml/qqmlimport/tst_qqmlimport.cpp
+++ b/tests/auto/qml/qqmlimport/tst_qqmlimport.cpp
@@ -26,6 +26,7 @@
 **
 ****************************************************************************/
 
+#include <QtCore/qscopeguard.h>
 #include <QtTest/QtTest>
 #include <QQmlApplicationEngine>
 #include <QQmlAbstractUrlInterceptor>
@@ -52,6 +53,7 @@ private slots:
     void partialImportVersions();
     void registerModuleImport();
     void cleanup();
+    void envResourceImportPath();
 };
 
 void tst_QQmlImport::cleanup()
@@ -59,6 +61,33 @@ void tst_QQmlImport::cleanup()
     QQmlImports::setDesignerSupportRequired(false);
 }
 
+void tst_QQmlImport::envResourceImportPath()
+{
+    const bool hadEnv = qEnvironmentVariableIsSet("QML2_IMPORT_PATH");
+    const QByteArray oldEnv = hadEnv ? qgetenv("QML2_IMPORT_PATH") : QByteArray();
+    auto guard = qScopeGuard([&] {
+        if (hadEnv)
+            qputenv("QML2_IMPORT_PATH", oldEnv);
+        else
+            qunsetenv("QML2_IMPORT_PATH");
+    });
+
+    const QStringList envPaths({
+        QLatin1String(":/some/resource"),
+        dataDirectory(),
+        QLatin1String(":/some/other/resource"),
+        directory()
+    });
+
+    qputenv("QML2_IMPORT_PATH", envPaths.join(QDir::listSeparator()).toUtf8());
+
+    QQmlImportDatabase importDb(nullptr);
+    const QStringList importPaths = importDb.importPathList();
+
+    for (const QString &path : envPaths)
+        QVERIFY((importPaths.contains(path.startsWith(u':') ? QLatin1String("qrc") + path : path)));
+}
+
 void tst_QQmlImport::testDesignerSupported()
 {
     QQuickView *window = new QQuickView();
-- 
cgit v1.2.3