diff options
author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-08-08 11:33:26 +0200 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-11 00:41:07 +0200 |
commit | 6f4ff81380862ad0e788151b35d742f548241d5a (patch) | |
tree | e503172ebde3ab84666a135ab6953e2c57d22352 /mkspecs/features/qt_functions.prf | |
parent | ff13798708071573e6188e9daff238ccd85d11ca (diff) |
assemble the complete tool commands already in qt_tool.prf
this saves some repeated calculations. also, it's nicer to have most
logic in one place.
Change-Id: Iea362d40f5e6203709ced94d29ca61a4163b8e69
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'mkspecs/features/qt_functions.prf')
-rw-r--r-- | mkspecs/features/qt_functions.prf | 26 |
1 files changed, 2 insertions, 24 deletions
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index 2246551573..82916ffd67 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -155,7 +155,7 @@ defineTest(qtAddModules) { # variable, default defineTest(qtPrepareTool) { - $$1 = $$eval(QT_TOOL.$${2}.binary) + $$1 = $$eval(QT_TOOL.$${2}.command) isEmpty($$1) { MODBASE = $$[QT_HOST_BINS/get] count(ARGS, 2, greaterThan) { @@ -175,30 +175,8 @@ defineTest(qtPrepareTool) { $$1 = $$BUNDLENAME } } + $$1 = $$shell_path($$eval($$1)) } - $$1 = $$shell_path($$eval($$1)) - - deps = $$resolve_depends(QT_TOOL.$${2}.depends, "QT.") - !isEmpty(deps) { - for(dep, deps): \ - deppath += $$shell_path($$eval(QT.$${dep}.libs)) - deppath = $$unique(deppath) - equals(QMAKE_DIR_SEP, /) { - equals(QMAKE_HOST.os, Windows): \ - var = PATH - else:contains(QMAKE_HOST.os, Linux): \ - var = LD_LIBRARY_PATH - else:equals(QMAKE_HOST.os, Darwin): \ - var = DYLD_LIBRARY_PATH - else: \ - error("Operating system not supported.") - $$1 = "$$var=$$join(deppath, :)${$$var:+:\$$$var} $$eval($$1)" - } else { - # Escape closing parens when expanding %PATH%, otherwise cmd confuses itself. - $$1 = "(set PATH=$$join(deppath, ;);%PATH:)=^)%) & $$eval($$1)" - } - } - export($$1) } |