diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-04-14 16:53:55 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-15 17:37:42 +0200 |
| commit | ee86ce89a63a5a7b071ec4116987609aa2a17600 (patch) | |
| tree | 3a9efd73b5a7e554756cfff49ca29ea502345ec5 /mkspecs/features/qt_module.prf | |
| parent | a5e4d3d4db03ba3092d0d415cee6c5ed1a7b4f5b (diff) | |
don't attempt to replace include paths in meta files
neither .prl nor .la files even contain include paths.
in .pc files, we assign the final path to start with, so there is
nothing to replace, either.
Change-Id: I919dfa01e0a1d0ef8ef1220174de1d33c66cedf9
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'mkspecs/features/qt_module.prf')
| -rw-r--r-- | mkspecs/features/qt_module.prf | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf index 2134077ed3..1ff55019f3 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf @@ -170,30 +170,27 @@ load(qt_installs) rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]* else: \ rplbase = $$MODULE_BASE_OUTDIR -include_replace.match = $$rplbase/include -include_replace.replace = $$[QT_INSTALL_HEADERS/raw] -include_replace.CONFIG = path lib_replace.match = $$rplbase/lib host_build: \ lib_replace.replace = $$[QT_HOST_LIBS] else: \ lib_replace.replace = $$[QT_INSTALL_LIBS/raw] lib_replace.CONFIG = path -QMAKE_PRL_INSTALL_REPLACE += include_replace lib_replace +QMAKE_PRL_INSTALL_REPLACE += lib_replace unix|mingw { CONFIG += create_pc QMAKE_PKGCONFIG_LIBDIR = $$lib_replace.replace - QMAKE_PKGCONFIG_INCDIR = $$include_replace.replace + QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS/raw] QMAKE_PKGCONFIG_CFLAGS = -I${includedir}/$$MODULE_INCNAME QMAKE_PKGCONFIG_DESTDIR = pkgconfig - QMAKE_PKGCONFIG_INSTALL_REPLACE += include_replace lib_replace + QMAKE_PKGCONFIG_INSTALL_REPLACE += lib_replace } unix { CONFIG += create_libtool explicitlib QMAKE_LIBTOOL_LIBDIR = $$lib_replace.replace - QMAKE_LIBTOOL_INSTALL_REPLACE += include_replace lib_replace + QMAKE_LIBTOOL_INSTALL_REPLACE += lib_replace } unix|mingw { |