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

Made modules that depend on other modules add their include paths.

Browse Source 
This is needed so that header files which contain references to those
modules (for example in templates) will have their include paths as
well.

RevBy:    axis
This commit is contained in:
Marius Storm-Olsen 2011-01-04 16:37:10 +01:00 committed by axis
parent 12207a855f
commit 3ec5d96657
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mkspecs/features/qt.prf
View File

@ -124,6 +124,7 @@ QMAKE_LIBDIR += $$QMAKE_LIBDIR_QT
# Topological ordering of modules based on their QT.<module>.depends variable
QT = $$resolve_depends($$QT, "QT.")
QT_DEPENDS=
for(QTLIB, $$list($$lower($$unique(QT)))) {
isEmpty(QT.$${QTLIB}.name) {
@ -136,8 +137,13 @@ for(QTLIB, $$list($$lower($$unique(QT)))) {
next()
}
qtAddModule($$QTLIB)
QT_DEPENDS += $$eval(QT.$${QTLIB}.depends)
}
# add include paths for all .depends, since module/application might need f.ex. template specializations etc.
QT_DEPENDS -= $$QT
for(QTLIB, $$list($$lower($$unique(QT_DEPENDS)))):INCLUDEPATH += $$INCLUDEPATH $$eval(QT.$${QTLIB}.includes)
qt_compat {
!qt_compat_no_warning:QTDIR_build:warning(***USE of COMPAT inside of QTDIR!**) #just for us
INCLUDEPATH *= $$QMAKE_INCDIR_QT/Qt