fix path adjustments in installed metafiles
Task-number: QTBUG-28902 Change-Id: Ia70da8f0f0b7abb4ea2a46cb4068c0827888b322 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
This commit is contained in:
parent
6d90c2e9cb
commit
2be4d6ba02
@ -89,3 +89,12 @@ load(qt_targets)
|
||||
}
|
||||
|
||||
load(qml_module)
|
||||
|
||||
unix|win32-g++* {
|
||||
!isEmpty(_QMAKE_SUPER_CACHE_): \
|
||||
lib_replace.match = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]*/lib
|
||||
else: \
|
||||
lib_replace.match = $$eval(QT.$${CXX_MODULE}.libs)
|
||||
lib_replace.replace = $$[QT_INSTALL_LIBS/raw]
|
||||
QMAKE_PRL_INSTALL_REPLACE += lib_replace
|
||||
}
|
||||
|
@ -58,3 +58,13 @@ load(qt_targets)
|
||||
|
||||
wince*:LIBS += $$QMAKE_LIBS_GUI
|
||||
QMAKE_LFLAGS += $$QMAKE_LFLAGS_NOUNDEF
|
||||
|
||||
unix|win32-g++* {
|
||||
!isEmpty(_QMAKE_SUPER_CACHE_): \
|
||||
rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]*
|
||||
else: \
|
||||
rplbase = $$MODULE_QMAKE_OUTDIR
|
||||
lib_replace.match = $$rplbase/lib
|
||||
lib_replace.replace = $$[QT_INSTALL_LIBS/raw]
|
||||
QMAKE_PRL_INSTALL_REPLACE += lib_replace
|
||||
}
|
||||
|
@ -25,3 +25,9 @@ TARGET = $$qtLibraryTarget($$TARGET$$QT_LIBINFIX) #do this towards the end
|
||||
load(qt_targets)
|
||||
|
||||
wince*:QMAKE_POST_LINK =
|
||||
|
||||
unix|win32-g++* {
|
||||
lib_replace.match = $$[QT_INSTALL_LIBS/get]
|
||||
lib_replace.replace = $$[QT_INSTALL_LIBS/raw]
|
||||
QMAKE_PRL_INSTALL_REPLACE += lib_replace
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user