diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-01-27 21:34:04 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-29 00:18:15 +0100 |
| commit | 30efc99c67586fdd5da8b1c2d7e7a1a302a652e9 (patch) | |
| tree | 78635faabeedba1b0b41628c85b6f634f7f994d6 /mkspecs/features/moc.prf | |
| parent | 6d5df33d58debdd3d14dddeccd17cba4f952e5bd (diff) | |
use the response file also for the default incdirs
Change-Id: I328cdd32d43f263992af206c66b502564e954d53
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'mkspecs/features/moc.prf')
| -rw-r--r-- | mkspecs/features/moc.prf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/features/moc.prf b/mkspecs/features/moc.prf index 652d5ea94f..f4709c75f0 100644 --- a/mkspecs/features/moc.prf +++ b/mkspecs/features/moc.prf @@ -5,7 +5,7 @@ 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 +MOC_INCLUDEPATH = $$QMAKESPEC $$_PRO_FILE_PWD_ $$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 @@ -27,7 +27,7 @@ defineReplace(mocCmdBase) { incvar = $$join(MOC_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 + RET += $$QMAKE_MOC $(DEFINES) $$join(QMAKE_COMPILER_DEFINES, " -D", -D) $$incvar $$QMAKE_MOC_OPTIONS return($$RET) } |