1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make modules compile without hardcoded paths

Browse Source
This commit is contained in:
Marius Storm-Olsen 2010-11-24 13:21:56 -06:00 committed by axis
parent 78797cc7e9
commit 68d7b61d48
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/corelib/corelib.pro
View File

@ -1,3 +1,4 @@
MODULE = core
TARGET = QtCore TARGET = QtCore
QPRO_PWD = $$PWD QPRO_PWD = $$PWD
QT = QT =

5
src/qbase.pri
View File

@ -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_}") isEmpty(TARGET):error("You must set TARGET before include()'ing $${_FILE_}")
MODULE_INCLUDES = $$eval(QT.$${MODULE}.includes) MODULE_INCLUDES = $$eval(QT.$${MODULE}.includes)
@ -13,7 +16,7 @@ isEmpty(QT_MAJOR_VERSION) {
#load up the headers info #load up the headers info
CONFIG += qt_install_headers 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) include($$HEADERS_PRI, "", true)|clear(HEADERS_PRI)
#version overriding #version overriding