blob: c6aa4b4f84fa2bdd5dfe49cde62f805ce54ff751 (
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
|
From 2408dbbdebc9185ca127f00bf2cada087db403d5 Mon Sep 17 00:00:00 2001
From: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Date: Fri, 14 Jan 2011 21:35:58 -0600
Subject: [PATCH] Add QMAKESPEC_ORIGINAL to the INCLUDEPATH when needed
---
qtbase/mkspecs/features/qt.prf | 5 +++++
1 files changed, 5 insertions(+), 0 deletions(-)
diff --git a/qtbase/mkspecs/features/qt.prf b/qtbase/mkspecs/features/qt.prf
index c1584fc..c9b4205 100644
--- a/qtbase/mkspecs/features/qt.prf
+++ b/qtbase/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
--
1.7.2.3.msysgit.0.311.gb27be
|
