use the right env var in qmlplugindump call
qml2 needs QML2_IMPORT_PATH. this didn't affect non-prefix builds (which most developers use), so it wasn't too serious. Change-Id: I435dca151348669b66f091f9a9324cd69394284e Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
parent
7a1e17a350
commit
f9b61eca4e
@ -75,10 +75,13 @@ load(qt_common)
|
||||
}
|
||||
|
||||
load(resolve_target)
|
||||
qml1_target: \
|
||||
qml1_target {
|
||||
qmlplugindump = qml1plugindump
|
||||
else: \
|
||||
importpath.name = QML_IMPORT_PATH
|
||||
} else {
|
||||
qmlplugindump = qmlplugindump
|
||||
importpath.name = QML2_IMPORT_PATH
|
||||
}
|
||||
qtPrepareTool(QMLPLUGINDUMP, $$qmlplugindump)
|
||||
importpath.value =
|
||||
for(qmod, QTREPOS) {
|
||||
@ -88,7 +91,6 @@ load(qt_common)
|
||||
qmod = $$qmod/qml
|
||||
exists($$qmod): importpath.value += $$shell_path($$qmod)
|
||||
}
|
||||
importpath.name = QML_IMPORT_PATH
|
||||
importpath.value = $$unique(importpath.value)
|
||||
qtAddToolEnv(QMLPLUGINDUMP, importpath)
|
||||
TARGETPATHBASE = $$replace(TARGETPATH, \\.\\d+\$, )
|
||||
|
Loading…
x
Reference in New Issue
Block a user