blob: c30fae46e597d42ce3e1c593d88e9bee96d1da16 (
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 f2f7ed0070e4bfdb9c870c349175a009d0c045f8 Mon Sep 17 00:00:00 2001
From: Prasanth Ullattil <prasanth.ullattil@nokia.com>
Date: Wed, 26 Jan 2011 09:44:09 +0100
Subject: [PATCH] Include headers.pri from the last path in MODULE_INCLUDES
---
qtbase/src/qbase.pri | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/qtbase/src/qbase.pri b/qtbase/src/qbase.pri
index 97f65e4..e428802 100644
--- a/qtbase/src/qbase.pri
+++ b/qtbase/src/qbase.pri
@@ -16,7 +16,10 @@ isEmpty(QT_MAJOR_VERSION) {
#load up the headers info
CONFIG += qt_install_headers
-HEADERS_PRI = $$MODULE_INCLUDES/headers.pri
+#headers.pri is loaded from the last include path
+LAST_MODULE_INCLUDE=$$MODULE_INCLUDES
+for(include_path, MODULE_INCLUDES):LAST_MODULE_INCLUDE=$${include_path}
+HEADERS_PRI = $$LAST_MODULE_INCLUDE/headers.pri
include($$HEADERS_PRI, "", true)|clear(HEADERS_PRI)
#version overriding
--
1.7.3.2.343.g7d43d
|
