pkgs/development/libraries/qt-5/5.6/qtdeclarative.patch at 18.09-beta

pyrox.dev / nixpkgs

fork atom

lol

fork atom

nixpkgs / pkgs / development / libraries / qt-5 / 5.6 / qtdeclarative.patch

at 18.09-beta 20 lines 918 B view raw

wrap content

Thomas Tuegel qt5: factor out common definitions and remove symlink farm 8 years ago

fe0ab944

 1diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp
 2index dfdf2edbe..7ee96049d 100644
 3--- a/src/qml/qml/qqmlimport.cpp
 4+++ b/src/qml/qml/qqmlimport.cpp
 5@@ -1568,6 +1568,15 @@ QQmlImportDatabase::QQmlImportDatabase(QQmlEngine *e)
 6     QString installImportsPath =  QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath);
 7     addImportPath(installImportsPath);
 8 
 9+    // Add import paths derived from PATH
10+    const QStringList paths = QFile::decodeName(qgetenv("PATH")).split(':');
11+    const QString qmldir = QStringLiteral("../" NIXPKGS_QML2_IMPORT_PREFIX);
12+    for (const QString &path: paths) {
13+        if (!path.isEmpty()) {
14+            addImportPath(QDir::cleanPath(path + QDir::separator() + qmldir));
15+        }
16+    }
17+
18     // env import paths
19     if (Q_UNLIKELY(!qEnvironmentVariableIsEmpty("QML2_IMPORT_PATH"))) {
20         const QByteArray envImportPath = qgetenv("QML2_IMPORT_PATH");