diff options
| author | K900 <me@0upti.me> | 2024-01-19 12:52:59 +0300 |
|---|---|---|
| committer | K900 <me@0upti.me> | 2024-01-19 15:34:40 +0300 |
| commit | e44cf032bc2c516e41a41cb58dbd6575bf85a221 (patch) | |
| tree | f7f4fab8a12e306f196db37b64483e27c5a16f50 /pkgs/development/libraries/qt-5 | |
| parent | 631f14c407cc3f7bad7d1cad35b14e61f618297e (diff) | |
qt5, qt6: fix QML path search order
QQmlImportDatabase::addImportPath _prepends_ to the search path, so our version specific search paths need to be added in last.
Diffstat (limited to 'pkgs/development/libraries/qt-5')
| -rw-r--r-- | pkgs/development/libraries/qt-5/5.15/qtdeclarative-qml-paths.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/development/libraries/qt-5/5.15/qtdeclarative-qml-paths.patch b/pkgs/development/libraries/qt-5/5.15/qtdeclarative-qml-paths.patch index 2ea3554df7d2a..e207fa4df3bd4 100644 --- a/pkgs/development/libraries/qt-5/5.15/qtdeclarative-qml-paths.patch +++ b/pkgs/development/libraries/qt-5/5.15/qtdeclarative-qml-paths.patch @@ -1,5 +1,5 @@ diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp -index 289f11d006..80c422403c 100644 +index 289f11d006..9b0a48c6c7 100644 --- a/src/qml/qml/qqmlimport.cpp +++ b/src/qml/qml/qqmlimport.cpp @@ -1897,17 +1897,22 @@ QQmlImportDatabase::QQmlImportDatabase(QQmlEngine *e) @@ -26,8 +26,8 @@ index 289f11d006..80c422403c 100644 + } + }; + -+ addEnvImportPath("NIXPKGS_QT5_QML_IMPORT_PATH"); + addEnvImportPath("QML2_IMPORT_PATH"); ++ addEnvImportPath("NIXPKGS_QT5_QML_IMPORT_PATH"); addImportPath(QStringLiteral("qrc:/qt-project.org/imports")); addImportPath(QCoreApplication::applicationDirPath()); |