From 0e1427b0a6c3d304aabecd3d33708ecb0544fdba Mon Sep 17 00:00:00 2001 From: Mark Brand Date: Tue, 29 Jan 2013 21:56:24 +0100 Subject: adjust paths in installed module metafiles from modular build Fully modular prefix build now puts the includes and libs into each module's own builddir, so the else branch was simply bogus. Replaced the else branch with the real base for modular builds. This allows the paths to be successfully replaced when installing metafiles. Change-Id: I056a923288965b560a4e9b0ba7add1aac912199f Reviewed-by: Oswald Buddenhagen --- mkspecs/features/qt_module.prf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mkspecs/features/qt_module.prf') diff --git a/mkspecs/features/qt_module.prf b/mkspecs/features/qt_module.prf index 19cdc2a26a..13ac35aa0e 100644 --- a/mkspecs/features/qt_module.prf +++ b/mkspecs/features/qt_module.prf @@ -190,7 +190,7 @@ unix|win32-g++* { !isEmpty(_QMAKE_SUPER_CACHE_): \ rplbase = $$dirname(_QMAKE_SUPER_CACHE_)/[^/][^/]* else: \ - rplbase = $$[QT_INSTALL_PREFIX/get] + rplbase = $$MODULE_QMAKE_OUTDIR include_replace.match = $$rplbase/include include_replace.replace = $$[QT_INSTALL_HEADERS/raw] lib_replace.match = $$rplbase/lib -- cgit v1.2.3