whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

factor out qtAddTargetEnv() 

Change-Id: Ib0517da54da98de4b1f2ee7d80bee22316231091
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
bb10
Oswald Buddenhagen 2012-09-14 15:38:56 +02:00 committed by The Qt Project
parent 4ac264117a
commit aad3410864
2 changed files with 32 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
mkspecs/features/qt_functions.prf
View File

@ -204,6 +204,37 @@ defineTest(qtAddToolEnv) {
export($$1)
}
defineTest(qtAddTargetEnv) {
deps = $$resolve_depends(QT, "QT.")
!isEmpty(deps) {
plugin_paths =
for(dep, deps) {
deppath += $$shell_path($$eval(QT.$${dep}.libs))
for(rpath, QT.$${dep}.rpath_link): \
deppath += $$shell_path($$rpath)
plugin_paths += $$eval(QT.$${dep}.plugin_path) $$eval(QT.$${dep}.plugins)
}
equals(QMAKE_HOST.os, Windows): \
deppath.name = PATH
else:contains(QMAKE_HOST.os, Linux|FreeBSD): \
deppath.name = LD_LIBRARY_PATH
else:equals(QMAKE_HOST.os, Darwin): \
deppath.name = DYLD_LIBRARY_PATH
else: \
error("Operating system not supported.")
deppath.value = $$unique(deppath)
deppath.CONFIG = prepend
pluginpath.name = QT_PLUGIN_PATH
pluginpath.value =
plugin_paths = $$unique(plugin_paths)
for(ppath, plugin_paths): \
exists($$ppath): \
pluginpath.value += $$shell_path($$ppath)
QT_TOOL_ENV += deppath pluginpath
}
qtAddToolEnv($$1, $$QT_TOOL_ENV)
}
defineReplace(pkgConfigExecutable) {
isEmpty(PKG_CONFIG) {
PKG_CONFIG = pkg-config

30
mkspecs/features/qt_tool.prf
View File

@ -33,35 +33,7 @@ INSTALLS += target
load(resolve_target)
cmd = $$shell_path($$QMAKE_RESOLVED_TARGET)
deps = $$resolve_depends(QT, "QT.")
!isEmpty(deps) {
plugin_paths =
for(dep, deps) {
deppath += $$shell_path($$eval(QT.$${dep}.libs))
for(rpath, QT.$${dep}.rpath_link): \
deppath += $$shell_path($$rpath)
plugin_paths += $$eval(QT.$${dep}.plugin_path) $$eval(QT.$${dep}.plugins)
}
equals(QMAKE_HOST.os, Windows): \
deppath.name = PATH
else:contains(QMAKE_HOST.os, Linux|FreeBSD): \
deppath.name = LD_LIBRARY_PATH
else:equals(QMAKE_HOST.os, Darwin): \
deppath.name = DYLD_LIBRARY_PATH
else: \
error("Operating system not supported.")
deppath.value = $$unique(deppath)
deppath.CONFIG = prepend
pluginpath.name = QT_PLUGIN_PATH
pluginpath.value =
plugin_paths = $$unique(plugin_paths)
for(ppath, plugin_paths): \
exists($$ppath): \
pluginpath.value += $$shell_path($$ppath)
QT_TOOL_ENV += deppath pluginpath
}
qtAddToolEnv(cmd, $$QT_TOOL_ENV)
qtAddTargetEnv(cmd)
TOOL_PRI = $$MODULE_QMAKE_OUTDIR/mkspecs/modules/qt_$${MODULE}.pri