diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-04-14 17:32:23 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-04-15 17:37:50 +0200 |
| commit | eaefbe36e88e75725083d52e03d3a7843aa418f6 (patch) | |
| tree | 58dcf8d9e5dde1aef1887419143882997de82548 /mkspecs | |
| parent | a33afed1989d08d6f76994052f0d34ea50bfd01e (diff) | |
snuff -L/-I with system paths when installing meta files
Task-number: QTBUG-37963
Change-Id: I8e268387f9dc33d7fab76395301b1396ca0445ff
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Davide Pesavento <davidepesa@gmail.com>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/qt_common.prf | 12 | ||||
| -rw-r--r-- | mkspecs/features/qt_module.prf | 4 |
2 files changed, 11 insertions, 5 deletions
diff --git a/mkspecs/features/qt_common.prf b/mkspecs/features/qt_common.prf index b58f969b07..4dcabe9237 100644 --- a/mkspecs/features/qt_common.prf +++ b/mkspecs/features/qt_common.prf @@ -24,11 +24,17 @@ contains(TEMPLATE, .*lib) { rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]* else: \ rplbase = $$MODULE_BASE_OUTDIR - lib_replace.match = $$rplbase/lib host_build: \ - lib_replace.replace = $$[QT_HOST_LIBS] + qt_libdir = $$[QT_HOST_LIBS] else: \ - lib_replace.replace = $$[QT_INSTALL_LIBS/raw] + qt_libdir = $$[QT_INSTALL_LIBS/raw] + contains(QMAKE_DEFAULT_LIBDIRS, $$qt_libdir) { + lib_replace.match = "[^ ']*$$rplbase/lib" + lib_replace.replace = + } else { + lib_replace.match = $$rplbase/lib + lib_replace.replace = $$qt_libdir + } lib_replace.CONFIG = path QMAKE_PRL_INSTALL_REPLACE += lib_replace } diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf index e250f93696..5dac0250ea 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf @@ -175,7 +175,7 @@ load(qt_common) unix|mingw { CONFIG += create_pc QMAKE_PKGCONFIG_DESTDIR = pkgconfig - QMAKE_PKGCONFIG_LIBDIR = $$lib_replace.replace + QMAKE_PKGCONFIG_LIBDIR = $$qt_libdir QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS/raw] QMAKE_PKGCONFIG_CFLAGS = -I${includedir}/$$MODULE_INCNAME QMAKE_PKGCONFIG_NAME = $$replace(TARGET, ^Qt, "Qt$$section(VERSION, ., 0, 0) ") @@ -188,7 +188,7 @@ unix|mingw { unix { CONFIG += create_libtool explicitlib - QMAKE_LIBTOOL_LIBDIR = $$lib_replace.replace + QMAKE_LIBTOOL_LIBDIR = $$qt_libdir QMAKE_LIBTOOL_INSTALL_REPLACE += lib_replace } } |