From b4c31488a7c8abc05871a39fa6b579c605429dcc Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen Date: Mon, 27 Jan 2014 22:00:29 +0100 Subject: resolve include paths against source dir this hasn't happened yet at this point of processing, so we'd pass bogus paths when shadow-building. Change-Id: I9f9633c0dbc2aadeff1eb555a8e598ddb0837e37 Reviewed-by: Thiago Macieira Reviewed-by: Joerg Bornemann --- mkspecs/features/moc.prf | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'mkspecs') diff --git a/mkspecs/features/moc.prf b/mkspecs/features/moc.prf index 6ce84f492d..100edc2d98 100644 --- a/mkspecs/features/moc.prf +++ b/mkspecs/features/moc.prf @@ -5,7 +5,10 @@ isEmpty(MOC_DIR):MOC_DIR = . isEmpty(QMAKE_H_MOD_MOC):QMAKE_H_MOD_MOC = moc_ isEmpty(QMAKE_EXT_CPP_MOC):QMAKE_EXT_CPP_MOC = .moc -MOC_INCLUDEPATH = $$QMAKESPEC $$_PRO_FILE_PWD_ $$INCLUDEPATH $$QMAKE_DEFAULT_INCDIRS +MOC_INCLUDEPATH = +for (inc, INCLUDEPATH): \ + MOC_INCLUDEPATH += $$absolute_path($$inc, $$_PRO_FILE_PWD_) +MOC_INCLUDEPATH = $$QMAKESPEC $$_PRO_FILE_PWD_ $$MOC_INCLUDEPATH $$QMAKE_DEFAULT_INCDIRS # On Windows, put the includes into a .inc file which moc will read, if the project # has too many includes. We do this to overcome a command-line limit on Win < XP -- cgit v1.2.3