1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use the right env var in qmlplugindump call

Browse Source 
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:
Oswald Buddenhagen 2014-06-02 13:40:53 +02:00 committed by The Qt Project
parent 7a1e17a350
commit f9b61eca4e
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
mkspecs/features/qml_plugin.prf
View File

@ -75,10 +75,13 @@ load(qt_common)
} }
load(resolve_target) load(resolve_target)
qml1_target: \ qml1_target {
qmlplugindump = qml1plugindump qmlplugindump = qml1plugindump
else: \ importpath.name = QML_IMPORT_PATH
} else {
qmlplugindump = qmlplugindump qmlplugindump = qmlplugindump
importpath.name = QML2_IMPORT_PATH
}
qtPrepareTool(QMLPLUGINDUMP, $$qmlplugindump) qtPrepareTool(QMLPLUGINDUMP, $$qmlplugindump)
importpath.value = importpath.value =
for(qmod, QTREPOS) { for(qmod, QTREPOS) {
@ -88,7 +91,6 @@ load(qt_common)
qmod = $$qmod/qml qmod = $$qmod/qml
exists($$qmod): importpath.value += $$shell_path($$qmod) exists($$qmod): importpath.value += $$shell_path($$qmod)
} }
importpath.name = QML_IMPORT_PATH
importpath.value = $$unique(importpath.value) importpath.value = $$unique(importpath.value)
qtAddToolEnv(QMLPLUGINDUMP, importpath) qtAddToolEnv(QMLPLUGINDUMP, importpath)
TARGETPATHBASE = $$replace(TARGETPATH, \\.\\d+\$, ) TARGETPATHBASE = $$replace(TARGETPATH, \\.\\d+\$, )