From 4c68e2558c8b90f301032f2e29130e6ac509dc21 Mon Sep 17 00:00:00 2001 From: Kai Koehne Date: Fri, 22 Jun 2018 16:48:58 +0200 Subject: Fix moc warnings with no_include_pwd and shadow builds If CONFIG option no_include_pwd is set, moc does not add the build directory to its include path. The path to the generated moc_predefs.h file is by default relative though, resulting in moc warnings: Warning: Failed to resolve include "debug/moc_predefs.h" for moc file xxx myheader.h Fix this by always making the path to moc_predefs.h absolute. Task-number: QTBUG-69087 Change-Id: I8ef79c8340f9ebd6b0bba15e026d65ef3c088535 Reviewed-by: Oswald Buddenhagen --- mkspecs/features/moc.prf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'mkspecs/features/moc.prf') diff --git a/mkspecs/features/moc.prf b/mkspecs/features/moc.prf index 37194b2eb8..5c7745e5bb 100644 --- a/mkspecs/features/moc.prf +++ b/mkspecs/features/moc.prf @@ -57,7 +57,7 @@ defineReplace(mocCmdBase) { msvc: RET += --compiler-flavor=msvc isEmpty(MOC_PREDEF_FILE): RET += $$join(QMAKE_COMPILER_DEFINES, " -D", -D) - else: RET += --include $$shell_quote($$moc_predefs.output) + else: RET += --include $$shell_quote($$absolute_path($$moc_predefs.output, $$OUT_PWD)) RET += $$incvar $$QMAKE_MOC_OPTIONS return($$RET) -- cgit v1.2.3