diff options
| author | Marius Storm-Olsen <marius.storm-olsen@nokia.com> | 2010-11-24 22:20:01 -0600 |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2011-04-27 12:05:46 +0200 |
| commit | 78797cc7e97c8337c14a094928b0843874e0bf89 (patch) | |
| tree | cad8c389865fcf9a0a96e6c4171b7a164072dd50 /src/qbase.pri | |
| parent | bca5a5d6f6e317151f3dab56f1d804af8d1aa62a (diff) | |
Make qt.prf use new qt_module.pri structure for QT variable
This change requires the new resolve_depends(var, prefix) function in qmake.
Diffstat (limited to 'src/qbase.pri')
| -rw-r--r-- | src/qbase.pri | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/qbase.pri b/src/qbase.pri index ce69757378..8b29eae69c 100644 --- a/src/qbase.pri +++ b/src/qbase.pri @@ -1,5 +1,7 @@ isEmpty(TARGET):error("You must set TARGET before include()'ing $${_FILE_}") -INCLUDEPATH *= $$QMAKE_INCDIR_QT/$$TARGET #just for today to have some compat + +MODULE_INCLUDES = $$eval(QT.$${MODULE}.includes) +INCLUDEPATH *= $$MODULE_INCLUDES $$MODULE_INCLUDES/.. #just for today to have some compat !isEmpty(RCC_DIR): INCLUDEPATH += $$RCC_DIR isEmpty(QT_ARCH):!isEmpty(ARCH):QT_ARCH=$$ARCH #another compat that will rot for change #215700 TEMPLATE = lib |