diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2012-08-13 15:35:35 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-15 09:18:58 +0200 |
| commit | 07e187a3418b1ee6386f9cdee8c14ba0d01636f7 (patch) | |
| tree | e6230eca7c02bf478aa8348b3343719794194bff /mkspecs | |
| parent | 17adbb232bfc8972ba54cbea3be9dbb24d9b4dfc (diff) | |
make .private_includes in module pri files "self-contained"
this puts the whole logic of assembling those paths into qt_module.
Change-Id: Iafbe3969e3092e294bdb8243b2dffa7a899a7eb8
Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qt_functions.prf | 8 | ||||
| -rw-r--r-- | mkspecs/features/qt_module.prf | 4 |
2 files changed, 3 insertions, 9 deletions
diff --git a/mkspecs/features/qt_functions.prf b/mkspecs/features/qt_functions.prf index a8f4d34268..724d0276ae 100644 --- a/mkspecs/features/qt_functions.prf +++ b/mkspecs/features/qt_functions.prf @@ -51,13 +51,7 @@ defineTest(qtAddModule) { INCLUDEPATH *= $$MODULE_INCLUDES auto_use_privates|isEqual(2, UsePrivate) { # Tests function parameter 2 ($$2) being equal to 'UsePrivate' - # This adds both - # <module privates include path>/ - # and <module privates include path>/<module name> - # since we have code using both #include <QtCore/private/foo> and #include <private/foo> - # Both need to be supported with the new private includes structure - MODULE_INCLUDES_PRIVATES = $$eval(QT.$${1}.private_includes) - INCLUDEPATH += $$MODULE_INCLUDES_PRIVATES $$MODULE_INCLUDES_PRIVATES/$$MODULE_NAME + INCLUDEPATH += $$eval(QT.$${1}.private_includes) } unset(LINKAGE) diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf index f97633703c..19c22c9692 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf @@ -81,7 +81,8 @@ MODULE_PRI = $$MODULE_QMAKE_OUTDIR/mkspecs/modules-inst/qt_$${MODULE}.pri "QT.$${MODULE}.name = $$TARGET" \ "QT.$${MODULE}.bins = \$\$QT_MODULE_BIN_BASE" \ "QT.$${MODULE}.includes = \$\$QT_MODULE_INCLUDE_BASE \$\$QT_MODULE_INCLUDE_BASE/$$TARGET" \ - "QT.$${MODULE}.private_includes = \$\$QT_MODULE_INCLUDE_BASE/$$TARGET/\$\$QT.$${MODULE}.VERSION" \ + "QT.$${MODULE}.private_includes = \$\$QT_MODULE_INCLUDE_BASE/$$TARGET/\$\$QT.$${MODULE}.VERSION \ + \$\$QT_MODULE_INCLUDE_BASE/$$TARGET/\$\$QT.$${MODULE}.VERSION/$$TARGET" \ "QT.$${MODULE}.sources = $$val_escape(_PRO_FILE_PWD_)" \ "QT.$${MODULE}.libs = \$\$QT_MODULE_LIB_BASE" \ "QT.$${MODULE}.plugins = \$\$QT_MODULE_PLUGIN_BASE" \ @@ -105,7 +106,6 @@ MODULE_INCLUDES = $$eval(QT.$${MODULE}.includes) MODULE_PRIVATE_INCLUDES = $$eval(QT.$${MODULE}.private_includes) INCLUDEPATH *= $$MODULE_INCLUDES INCLUDEPATH *= $$MODULE_PRIVATE_INCLUDES -INCLUDEPATH *= $$MODULE_PRIVATE_INCLUDES/$$TARGET load(qt_module_headers) |