summaryrefslogtreecommitdiffstats
path: root/mkspecs/features
diff options
context:
space:
mode:
authorThiago Macieira <thiago.macieira@intel.com>2013-12-09 10:56:31 -0800
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-01-20 02:42:31 +0100
commit0b144bc76a368ecc6c5c1121a1b51e888a0621ac (patch)
tree7e461a57e9170fb39b935923e227abfff3af583a /mkspecs/features
parent6f7d370adec3054656f36b0d2a0777a8a1df3602 (diff)
Add support for using -isystem in qmake
This commit will make qmake use -isystem automatically for any compilers that declare support for it for any paths that are listed in QMAKE_DEFAULT_INCDIRS. Change-Id: I36fefc6d5bba61671f65669f0ea42704b3c3cf31 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'mkspecs/features')
-rw-r--r--mkspecs/features/moc.prf3
1 files changed, 2 insertions, 1 deletions
diff --git a/mkspecs/features/moc.prf b/mkspecs/features/moc.prf
index b688f81367..f60e7b54e3 100644
--- a/mkspecs/features/moc.prf
+++ b/mkspecs/features/moc.prf
@@ -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)