1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

snuff -L/-I with system paths when installing meta files

Browse Source 
Task-number: QTBUG-37963
Change-Id: I8e268387f9dc33d7fab76395301b1396ca0445ff
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Davide Pesavento <davidepesa@gmail.com>
This commit is contained in:
Oswald Buddenhagen 2014-04-14 17:32:23 +02:00 committed by The Qt Project
parent a33afed198
commit eaefbe36e8
2 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
mkspecs/features/qt_common.prf
View File

@ -24,11 +24,17 @@ contains(TEMPLATE, .*lib) {
rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]* rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]*
else: \ else: \
rplbase = $$MODULE_BASE_OUTDIR rplbase = $$MODULE_BASE_OUTDIR
lib_replace.match = $$rplbase/lib
host_build: \ host_build: \
lib_replace.replace = $$[QT_HOST_LIBS] qt_libdir = $$[QT_HOST_LIBS]
else: \ 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 lib_replace.CONFIG = path
QMAKE_PRL_INSTALL_REPLACE += lib_replace QMAKE_PRL_INSTALL_REPLACE += lib_replace
} }

4
mkspecs/features/qt_module.prf
View File

@ -175,7 +175,7 @@ load(qt_common)
unix|mingw { unix|mingw {
CONFIG += create_pc CONFIG += create_pc
QMAKE_PKGCONFIG_DESTDIR = pkgconfig QMAKE_PKGCONFIG_DESTDIR = pkgconfig
QMAKE_PKGCONFIG_LIBDIR = $$lib_replace.replace QMAKE_PKGCONFIG_LIBDIR = $$qt_libdir
QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS/raw] QMAKE_PKGCONFIG_INCDIR = $$[QT_INSTALL_HEADERS/raw]
QMAKE_PKGCONFIG_CFLAGS = -I${includedir}/$$MODULE_INCNAME QMAKE_PKGCONFIG_CFLAGS = -I${includedir}/$$MODULE_INCNAME
QMAKE_PKGCONFIG_NAME = $$replace(TARGET, ^Qt, "Qt$$section(VERSION, ., 0, 0) ") QMAKE_PKGCONFIG_NAME = $$replace(TARGET, ^Qt, "Qt$$section(VERSION, ., 0, 0) ")
@ -188,7 +188,7 @@ unix|mingw {
unix { unix {
CONFIG += create_libtool explicitlib CONFIG += create_libtool explicitlib
QMAKE_LIBTOOL_LIBDIR = $$lib_replace.replace QMAKE_LIBTOOL_LIBDIR = $$qt_libdir
QMAKE_LIBTOOL_INSTALL_REPLACE += lib_replace QMAKE_LIBTOOL_INSTALL_REPLACE += lib_replace
} }
} }