From 34b95a643d0144e60d69dbae84953bb6a1a5c781 Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Tue, 16 Aug 2016 17:51:00 +0200 Subject: fix relative paths in forwarding headers to generated privates Change-Id: I837407503ef81f1059a7d531d9e57a67059855c8 Reviewed-by: Lars Knoll --- mkspecs/features/qt_module_headers.prf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'mkspecs') diff --git a/mkspecs/features/qt_module_headers.prf b/mkspecs/features/qt_module_headers.prf index d29e02ef3c..c0050f08d1 100644 --- a/mkspecs/features/qt_module_headers.prf +++ b/mkspecs/features/qt_module_headers.prf @@ -106,9 +106,10 @@ alien_syncqt: return() for (injection, SYNCQT.INJECTIONS) { injects = $$split(injection, :) + dst_hdr = $$absolute_path($$member(injects, 0), $$INC_PATH/include/$$MODULE_INCNAME) fwd_hdr = $$member(injects, 1) MAIN_FWD = $$INC_PATH/include/$$MODULE_INCNAME/$$fwd_hdr - MAIN_FWD_CONT = '$${LITERAL_HASH}include "$$member(injects, 0)"' + MAIN_FWD_CONT = '$${LITERAL_HASH}include "$$relative_path($$dst_hdr, $$dirname(MAIN_FWD))"' write_file($$MAIN_FWD, MAIN_FWD_CONT)|error() !git_build: QMAKE_DISTCLEAN += $$MAIN_FWD injects = $$member(injects, 2, -1) -- cgit v1.2.3