summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@digia.com>2013-03-14 19:10:32 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-03-15 17:58:06 +0100
commitd9ba123c6e541b8b305cff9c959387391fd90b1c (patch)
tree76bbe51c0a8029f66ee1485ed5b3556bd0ad4a08
parentb965c300710f38f1a50b784c8fcf2db49f35f262 (diff)
append $$QMAKE_DEFAULT_INCDIRS to moc invocations
unlike the real compiler, moc does not have these directories built in, so it would not find headers from a system install of qt. Task-number: QTBUG-28870 Change-Id: I86f18cdc8953145190163746dae59f4e784f2d78 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
-rw-r--r--mkspecs/features/moc.prf2
1 files changed, 1 insertions, 1 deletions
diff --git a/mkspecs/features/moc.prf b/mkspecs/features/moc.prf
index 282d215a60..3b0e511edb 100644
--- a/mkspecs/features/moc.prf
+++ b/mkspecs/features/moc.prf
@@ -47,7 +47,7 @@ defineReplace(mocCmdBase) {
} else {
incvar = $(INCPATH)
}
- RET += $$QMAKE_MOC $(DEFINES) $$incvar $$join(QMAKE_COMPILER_DEFINES, " -D", -D) $$QMAKE_MOC_OPTIONS
+ RET += $$QMAKE_MOC $(DEFINES) $$join(QMAKE_COMPILER_DEFINES, " -D", -D) $$incvar $$join(QMAKE_DEFAULT_INCDIRS, " -I", -I) $$QMAKE_MOC_OPTIONS
return($$RET)
}