Add QMAKESPEC_ORIGINAL to the INCLUDEPATH when needed
authorMarius Storm-Olsen <marius.storm-olsen@nokia.com>
Sat, 15 Jan 2011 03:35:58 +0000 (21:35 -0600)
committeraxis <qt-info@nokia.com>
Wed, 27 Apr 2011 10:05:53 +0000 (12:05 +0200)
mkspecs/features/qt.prf

index 419bb92..21fdd38 100644 (file)
@@ -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