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
44
45
46
47
48
49
50
51
52
53
54
55
56
57
|
From 227d1fcd0cf31823c511583070675e59518c71d9 Mon Sep 17 00:00:00 2001
From: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
Date: Wed, 24 Nov 2010 13:21:56 -0600
Subject: [PATCH] Make modules compile without hardcoded paths
---
qtbase/src/corelib/corelib.pro | 1 +
qtbase/src/qbase.pri | 5 ++++-
qtxmlpatterns/src/xmlpatterns/xmlpatterns.pro | 3 ---
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/qtbase/src/corelib/corelib.pro b/qtbase/src/corelib/corelib.pro
index 58d2c7b..4efb1b9 100644
--- a/qtbase/src/corelib/corelib.pro
+++ b/qtbase/src/corelib/corelib.pro
@@ -1,3 +1,4 @@
+MODULE = core
TARGET = QtCore
QPRO_PWD = $$PWD
QT =
diff --git a/qtbase/src/qbase.pri b/qtbase/src/qbase.pri
index 8b29eae..f8ababb 100644
--- a/qtbase/src/qbase.pri
+++ b/qtbase/src/qbase.pri
@@ -1,3 +1,6 @@
+load(qt_module)
+
+isEmpty(MODULE):MODULE = $$section($$list($$basename(_PRO_FILE_)), ., 0, 0)
isEmpty(TARGET):error("You must set TARGET before include()'ing $${_FILE_}")
MODULE_INCLUDES = $$eval(QT.$${MODULE}.includes)
@@ -13,7 +16,7 @@ isEmpty(QT_MAJOR_VERSION) {
#load up the headers info
CONFIG += qt_install_headers
-HEADERS_PRI = $$QT_BUILD_TREE/include/$$TARGET/headers.pri
+HEADERS_PRI = $$MODULE_INCLUDES/headers.pri
include($$HEADERS_PRI, "", true)|clear(HEADERS_PRI)
#version overriding
diff --git a/qtxmlpatterns/src/xmlpatterns/xmlpatterns.pro b/qtxmlpatterns/src/xmlpatterns/xmlpatterns.pro
index faeec54..d7db65c 100644
--- a/qtxmlpatterns/src/xmlpatterns/xmlpatterns.pro
+++ b/qtxmlpatterns/src/xmlpatterns/xmlpatterns.pro
@@ -11,9 +11,6 @@ unix|win32-g++*:QMAKE_PKGCONFIG_REQUIRES = QtCore \
QtNetwork
include($$QT_SOURCE_TREE/src/qbase.pri)
PRECOMPILED_HEADER = $$QT_SOURCE_TREE/src/corelib/global/qt_pch.h
-INCLUDEPATH += $$OUT_PWD/../../include \
- $$OUT_PWD/../../include/QtXmlPatterns \
- $$OUT_PWD/../../include/QtXmlPatterns/private
include($$PWD/common.pri)
include($$PWD/acceltree/acceltree.pri)
include($$PWD/api/api.pri)
--
1.7.3.2.343.g7d43d
|
