From 68d7b61d486e4249b0bd899bacbfca14e1f69f06 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

---
 src/corelib/corelib.pro | 1 +
 src/qbase.pri           | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro
index 58d2c7b..4efb1b9 100644
--- a/src/corelib/corelib.pro
+++ b/src/corelib/corelib.pro
@@ -1,3 +1,4 @@
+MODULE     = core
 TARGET	   = QtCore
 QPRO_PWD   = $$PWD
 QT         =
diff --git a/src/qbase.pri b/src/qbase.pri
index 8b29eae..f8ababb 100644
--- a/src/qbase.pri
+++ b/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
-- 
2.7.4