diff options
| author | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2011-01-04 16:37:10 +0100 |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2011-04-27 12:05:51 +0200 |
| commit | 3ec5d966574f1a9da7cfde573771cb95c376ce7c (patch) | |
| tree | 6d296a4c0f7224383a16bb437a2227e91b012f82 /mkspecs | |
| parent | 12207a855fc4bd8019830a8a540b4f01e675a4e4 (diff) | |
| download | qtbase-3ec5d966574f1a9da7cfde573771cb95c376ce7c.tar.gz | |
Made modules that depend on other modules add their include paths.
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
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qt.prf | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf index 4d8e4655b6..419bb920f0 100644 --- a/mkspecs/features/qt.prf +++ b/mkspecs/features/qt.prf @@ -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 |