diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2012-11-29 22:22:42 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-11-30 21:57:49 +0100 |
| commit | 2c8ebbc25bc55ba780ee3c09c62d3edc55eb3f25 (patch) | |
| tree | fba02906203db17c4b06b7f27052e79afdc08d53 /mkspecs/features/qt_module.prf | |
| parent | 5de4b24c997561d3865d227cb2dc3e9304f765ee (diff) | |
make it possible to name include dir differently from library name
ActiveQt needs that
Change-Id: Ib9f69d19e8042c1ab0f211eebb9237bc2fb77aa3
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@digia.com>
Diffstat (limited to 'mkspecs/features/qt_module.prf')
| -rw-r--r-- | mkspecs/features/qt_module.prf | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf index a4f324312d..35354fef2a 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf @@ -23,6 +23,8 @@ host_build|staticlib: CONFIG += static ucmodule = $$upper($$MODULE) +isEmpty(MODULE_INCNAME): MODULE_INCNAME = $$TARGET + MODULE_DEPENDS = $$replace(QT, -private$, ) MODULE_DEPENDS = $$unique(MODULE_DEPENDS) @@ -63,9 +65,9 @@ MODULE_PRI = $$MODULE_QMAKE_OUTDIR/mkspecs/modules-inst/qt_lib_$${MODULE}.pri else: \ module_config = !no_module_headers { - MODULE_INCLUDES = "\$\$QT_MODULE_INCLUDE_BASE \$\$QT_MODULE_INCLUDE_BASE/$$TARGET" - MODULE_PRIVATE_INCLUDES = "\$\$QT_MODULE_INCLUDE_BASE/$$TARGET/\$\$QT.$${MODULE}.VERSION \ - \$\$QT_MODULE_INCLUDE_BASE/$$TARGET/\$\$QT.$${MODULE}.VERSION/$$TARGET" + MODULE_INCLUDES = "\$\$QT_MODULE_INCLUDE_BASE \$\$QT_MODULE_INCLUDE_BASE/$$MODULE_INCNAME" + MODULE_PRIVATE_INCLUDES = "\$\$QT_MODULE_INCLUDE_BASE/$$MODULE_INCNAME/\$\$QT.$${MODULE}.VERSION \ + \$\$QT_MODULE_INCLUDE_BASE/$$MODULE_INCNAME/\$\$QT.$${MODULE}.VERSION/$$MODULE_INCNAME" } MODULE_PRI_CONT = \ "QT.$${MODULE}.VERSION = $${VERSION}" \ @@ -190,7 +192,7 @@ load(qt_installs) unix|win32-g++* { CONFIG += create_pc QMAKE_PKGCONFIG_LIBDIR = $$[QT_INSTALL_LIBS/raw] - QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS/raw]/$$TARGET + QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS/raw]/$$MODULE_INCNAME QMAKE_PKGCONFIG_CFLAGS = -I$$[QT_INSTALL_HEADERS/raw] QMAKE_PKGCONFIG_DESTDIR = pkgconfig include_replace.match = $$[QT_INSTALL_HEADERS/get] |