diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2014-01-10 07:10:27 -0800 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-16 03:00:29 +0100 |
| commit | 93a895a41a55e286e8393c5f8566ce6332b49277 (patch) | |
| tree | 8ea4afbef8e173963c9dfc6e387c81a1970de0a7 /mkspecs | |
| parent | 3c375a76a13e151496ccfea0a2b3ff9fdc75784f (diff) | |
Ensure that the mkspec and source dirs are passed to moc on Windows
Those paths need not be in INCLUDEPATH: qmake always adds them to the
compiler command-line and we should match the behavior if we expand
INCLUDEPATH here.
Change-Id: I89508d15ac534b54ae873a42c4ad9764408042b5
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'mkspecs')
| -rw-r--r-- | mkspecs/features/moc.prf | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mkspecs/features/moc.prf b/mkspecs/features/moc.prf index 59ac9db05b..b688f81367 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 |