tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
1diff --git a/src/particles/particles.pro b/src/particles/particles.pro
2index aaaa83419a..58aee00036 100644
3--- a/src/particles/particles.pro
4+++ b/src/particles/particles.pro
5@@ -20,6 +20,6 @@ QMLTYPES_FILENAME = plugins.qmltypes
6 QMLTYPES_INSTALL_DIR = $$[QT_INSTALL_QML]/QtQuick/Particles.2
7 QML_IMPORT_NAME = QtQuick.Particles
8 IMPORT_VERSION = 2.$$QT_MINOR_VERSION
9-CONFIG += qmltypes install_qmltypes install_metatypes
10+CONFIG += qmltypes install_qmltypes
11
12 load(qt_module)
13diff --git a/src/qml/qml.pro b/src/qml/qml.pro
14index e39a8319b6..90c0331278 100644
15--- a/src/qml/qml.pro
16+++ b/src/qml/qml.pro
17@@ -72,6 +72,6 @@ QMLTYPES_FILENAME = plugins.qmltypes
18 QMLTYPES_INSTALL_DIR = $$[QT_INSTALL_QML]/QtQml
19 QML_IMPORT_NAME = QtQml
20 IMPORT_VERSION = 2.$$QT_MINOR_VERSION
21-CONFIG += qmltypes install_qmltypes install_metatypes
22+CONFIG += qmltypes install_qmltypes
23
24 load(qt_module)
25diff --git a/src/qmlmodels/qmlmodels.pro b/src/qmlmodels/qmlmodels.pro
26index 4ac093556d..112e2c2be0 100644
27--- a/src/qmlmodels/qmlmodels.pro
28+++ b/src/qmlmodels/qmlmodels.pro
29@@ -68,6 +68,6 @@ QMLTYPES_FILENAME = plugins.qmltypes
30 QMLTYPES_INSTALL_DIR = $$[QT_INSTALL_QML]/QtQml/Models.2
31 QML_IMPORT_NAME = QtQml.Models
32 IMPORT_VERSION = 2.$$QT_MINOR_VERSION
33-CONFIG += qmltypes install_qmltypes install_metatypes
34+CONFIG += qmltypes install_qmltypes
35
36 load(qt_module)
37diff --git a/src/qmltest/qmltest.pro b/src/qmltest/qmltest.pro
38index c2e8068fc6..79dba368f7 100644
39--- a/src/qmltest/qmltest.pro
40+++ b/src/qmltest/qmltest.pro
41@@ -34,7 +34,7 @@ QMLTYPES_FILENAME = plugins.qmltypes
42 QMLTYPES_INSTALL_DIR = $$[QT_INSTALL_QML]/Qt/test/qtestroot
43 QML_IMPORT_NAME = Qt.test.qtestroot
44 QML_IMPORT_VERSION = 1.0
45-CONFIG += qmltypes install_qmltypes install_metatypes
46+CONFIG += qmltypes install_qmltypes
47
48 # Install qmldir
49 qmldir.files = $$PWD/qmldir
50diff --git a/src/qmlworkerscript/qmlworkerscript.pro b/src/qmlworkerscript/qmlworkerscript.pro
51index 84466062e1..79885455cc 100644
52--- a/src/qmlworkerscript/qmlworkerscript.pro
53+++ b/src/qmlworkerscript/qmlworkerscript.pro
54@@ -23,6 +23,6 @@ QMLTYPES_FILENAME = plugins.qmltypes
55 QMLTYPES_INSTALL_DIR = $$[QT_INSTALL_QML]/QtQml/WorkerScript.2
56 QML_IMPORT_NAME = QtQml.WorkerScript
57 IMPORT_VERSION = 2.$$QT_MINOR_VERSION
58-CONFIG += qmltypes install_qmltypes install_metatypes
59+CONFIG += qmltypes install_qmltypes
60
61 load(qt_module)
62diff --git a/src/quick/quick.pro b/src/quick/quick.pro
63index f2d49cf939..c401b04c4e 100644
64--- a/src/quick/quick.pro
65+++ b/src/quick/quick.pro
66@@ -52,4 +52,4 @@ QMLTYPES_FILENAME = plugins.qmltypes
67 QMLTYPES_INSTALL_DIR = $$[QT_INSTALL_QML]/QtQuick.2
68 QML_IMPORT_NAME = QtQuick
69 IMPORT_VERSION = 2.$$QT_MINOR_VERSION
70-CONFIG += qmltypes install_qmltypes install_metatypes
71+CONFIG += qmltypes install_qmltypes
72diff --git a/src/quickshapes/quickshapes.pro b/src/quickshapes/quickshapes.pro
73index 4dbd3e5e46..0c6b186fc8 100644
74--- a/src/quickshapes/quickshapes.pro
75+++ b/src/quickshapes/quickshapes.pro
76@@ -36,4 +36,4 @@ QMLTYPES_FILENAME = plugins.qmltypes
77 QMLTYPES_INSTALL_DIR = $$[QT_INSTALL_QML]/QtQuick/Shapes
78 QML_IMPORT_NAME = QtQuick.Shapes
79 IMPORT_VERSION = 1.$$QT_MINOR_VERSION
80-CONFIG += qmltypes install_qmltypes install_metatypes
81+CONFIG += qmltypes install_qmltypes
82diff --git a/src/qml/qml/qqmlimport.cpp b/src/qml/qml/qqmlimport.cpp
83index 005db4248..685c5b1b2 100644
84--- a/src/qml/qml/qqmlimport.cpp
85+++ b/src/qml/qml/qqmlimport.cpp
86@@ -1760,6 +1760,15 @@ QQmlImportDatabase::QQmlImportDatabase(QQmlEngine *e)
87 QString installImportsPath = QLibraryInfo::location(QLibraryInfo::Qml2ImportsPath);
88 addImportPath(installImportsPath);
89
90+ // Add import paths derived from PATH
91+ const QStringList paths = QFile::decodeName(qgetenv("PATH")).split(':');
92+ const QString qmldir = QStringLiteral("../" NIXPKGS_QML2_IMPORT_PREFIX);
93+ for (const QString &path: paths) {
94+ if (!path.isEmpty()) {
95+ addImportPath(QDir::cleanPath(path + QDir::separator() + qmldir));
96+ }
97+ }
98+
99 // env import paths
100 if (Q_UNLIKELY(!qEnvironmentVariableIsEmpty("QML2_IMPORT_PATH"))) {
101 const QString envImportPath = qEnvironmentVariable("QML2_IMPORT_PATH");
102diff --git a/tools/qmlcachegen/qmlcache.prf b/tools/qmlcachegen/qmlcache.prf
103index 537eaf62ea..e21de58f64 100644
104--- a/tools/qmlcachegen/qmlcache.prf
105+++ b/tools/qmlcachegen/qmlcache.prf
106@@ -26,7 +26,7 @@ defineReplace(qmlCacheOutputFileName) {
107 }
108
109 qmlcacheinst.base = $$QMLCACHE_DESTDIR
110-qmlcacheinst.path = $$[QT_INSTALL_QML]/$$TARGETPATH
111+qmlcacheinst.path = $$NIX_OUTPUT_QML/$$TARGETPATH
112 qmlcacheinst.CONFIG = no_check_exist
113
114 qmlcachegen.input = CACHEGEN_FILES