blob: ca93d54e7abf7ecef598e3bc141ad1a17cd25708 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
|
From 88922fd80297b74f547389db3ddfb9950e356145 Mon Sep 17 00:00:00 2001
From: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Date: Tue, 4 Jan 2011 16:37:10 +0100
Subject: [PATCH] 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
---
qtbase/mkspecs/features/qt.prf | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/qtbase/mkspecs/features/qt.prf b/qtbase/mkspecs/features/qt.prf
index 3b9c645..c1584fc 100644
--- a/qtbase/mkspecs/features/qt.prf
+++ b/qtbase/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
--
1.7.3.2.343.g7d43d
|
