fix LD_LIBRARY_PATH manipulation in uic calls not being make-escaped
the evaluator has the bug that function arguments are inherited. work around that by passing an explicitly empty 3rd parameter to qtAddTargetEnv(). proper fix upcoming in less critical branch. Change-Id: Ic45cc890abaa6271985590d4ebe02c96bff6dec4 Reviewed-by: Kai Koehne <kai.koehne@digia.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
This commit is contained in:
parent
f5e0ec5e16
commit
172fa29dff
@ -210,7 +210,7 @@ defineTest(qtPrepareTool) {
|
||||
qtAddTargetEnv($$1$$3, QT_TOOL.$${2}.depends, system)
|
||||
}
|
||||
$$1 = $$shell_path($$eval($$1))
|
||||
qtAddTargetEnv($$1, QT_TOOL.$${2}.depends)
|
||||
qtAddTargetEnv($$1, QT_TOOL.$${2}.depends, )
|
||||
}
|
||||
|
||||
# target variable, list of env var names, [non-empty: prepare for system(), not make]
|
||||
|
Loading…
Reference in New Issue
Block a user