diff options
Diffstat (limited to 'mkspecs/features/moc.prf')
| -rw-r--r-- | mkspecs/features/moc.prf | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/mkspecs/features/moc.prf b/mkspecs/features/moc.prf index 59ac9db05b..f60e7b54e3 100644 --- a/mkspecs/features/moc.prf +++ b/mkspecs/features/moc.prf @@ -21,12 +21,12 @@ win32:count(INCLUDEPATH, 40, >) { EOC = $$escape_expand(\\r\\h) } + RET = @echo -I$$QMAKESPEC > $$WIN_INCLUDETEMP $$EOC + RET += @echo -I$$_PRO_FILE_PWD_ >> $$WIN_INCLUDETEMP $$EOC unset(INCFILELIST) - RET = for(incfile, INCLUDEPATH) { INCFILELIST = -I$$incfile - isEmpty(RET): RET += @echo $$INCFILELIST> $$WIN_INCLUDETEMP $$EOC - else: RET += @echo $$INCFILELIST>> $$WIN_INCLUDETEMP $$EOC + RET += @echo $$INCFILELIST>> $$WIN_INCLUDETEMP $$EOC } !isEmpty(INCFILELIST):RET += @echo $$INCFILELIST>> $$WIN_INCLUDETEMP $$EOC @@ -45,7 +45,8 @@ defineReplace(mocCmdBase) { } incvar = @$$WIN_INCLUDETEMP } else { - incvar = $(INCPATH) + incvar = -I$$QMAKESPEC -I$$_PRO_FILE_PWD_ $$join(INCLUDEPATH, " -I", -I) + incvar += $$QMAKE_FRAMEWORKPATH_FLAGS } RET += $$QMAKE_MOC $(DEFINES) $$join(QMAKE_COMPILER_DEFINES, " -D", -D) $$incvar $$join(QMAKE_DEFAULT_INCDIRS, " -I", -I) $$QMAKE_MOC_OPTIONS return($$RET) |