AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove vestiges of .private_depends

Browse Source 
amends 16f4bc5b6.

Change-Id: I5a9acb2fb57e92a152656be196e55c830031988e
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>
This commit is contained in:
Oswald Buddenhagen 2015-05-21 12:06:23 +02:00
parent 79ad3de7bf
commit 1e2829f5bf
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mkspecs/features/qt_functions.prf
View File

@ -185,7 +185,7 @@ defineTest(qtAddRpathLink) {
# paths OTOH need to be put there. # paths OTOH need to be put there.
pubqt = $$replace(1, -private$, _private) pubqt = $$replace(1, -private$, _private)
pubdep = $$resolve_depends(pubqt, "QT.") pubdep = $$resolve_depends(pubqt, "QT.")
privdep = $$resolve_depends(pubqt, "QT.", ".depends" ".private_depends" ".run_depends") privdep = $$resolve_depends(pubqt, "QT.", ".depends" ".run_depends")
privdep -= $$pubdep privdep -= $$pubdep
rpaths = rpaths =
for(dep, privdep): \ for(dep, privdep): \
@ -259,7 +259,7 @@ defineTest(qtAddToolEnv) {
# target variable, dependency var name, [non-empty: prepare for system(), not make] # target variable, dependency var name, [non-empty: prepare for system(), not make]
defineTest(qtAddTargetEnv) { defineTest(qtAddTargetEnv) {
deps = $$replace($$2, -private$, _private) deps = $$replace($$2, -private$, _private)
deps = $$resolve_depends(deps, "QT.", ".depends" ".private_depends" ".run_depends") deps = $$resolve_depends(deps, "QT.", ".depends" ".run_depends")
!isEmpty(deps) { !isEmpty(deps) {
ptypes = ptypes =
for(dep, deps) { for(dep, deps) {