summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarius Storm-Olsen <marius.storm-olsen@nokia.com>2011-01-14 21:35:58 -0600
committeraxis <qt-info@nokia.com>2011-04-27 12:05:53 +0200
commit56ec511c6aecca9d9f7d3587ac5dfc662c891d84 (patch)
tree720e5225d4a0fe878f176c2e86f8506476a0ee3a
parent95137041abcc7c464f00ad2520bb5211a6a144d5 (diff)
Add QMAKESPEC_ORIGINAL to the INCLUDEPATH when needed
-rw-r--r--mkspecs/features/qt.prf5
1 files changed, 5 insertions, 0 deletions
diff --git a/mkspecs/features/qt.prf b/mkspecs/features/qt.prf
index 419bb920f0..21fdd38e70 100644
--- a/mkspecs/features/qt.prf
+++ b/mkspecs/features/qt.prf
@@ -11,6 +11,11 @@ win32 {
}
contains(DEFINES, QT_MAKEDLL)|contains(DEFINES, QT_DLL):QMAKE_QT_DLL = 1
}
+ # Some files include qplatformdefs.h, which lives in the individual mkspec directory
+ # However, if QMAKESPEC_ORIGINAL is set, the module/app is outside of the QtBase
+ # directory, and using the default profile. So we add the original mkspecs directory
+ # to the include path
+ !isEmpty(QMAKESPEC_ORIGINAL):INCLUDEPATH += $$QMAKESPEC_ORIGINAL
}
CONFIG(release, debug|release):DEFINES += QT_NO_DEBUG
no_keywords:DEFINES += QT_NO_KEYWORDS