diff options
| author | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2010-11-24 13:21:56 -0600 |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2011-04-27 12:05:47 +0200 |
| commit | 68d7b61d486e4249b0bd899bacbfca14e1f69f06 (patch) | |
| tree | c1494b3769010ba444c1f056594aa5dc541e11a0 /src | |
| parent | 78797cc7e97c8337c14a094928b0843874e0bf89 (diff) | |
Make modules compile without hardcoded paths
Diffstat (limited to 'src')
| -rw-r--r-- | src/corelib/corelib.pro | 1 | ||||
| -rw-r--r-- | src/qbase.pri | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/corelib/corelib.pro b/src/corelib/corelib.pro index 58d2c7b2c6..4efb1b9a22 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 8b29eae69c..f8ababbe51 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 |