summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorKeno Fischer <kenof@stanford.edu>2011-09-07 18:58:40 +0200
committerQt by Nokia <qt-info@nokia.com>2011-09-07 19:04:20 +0200
commitb2780e60c7f4e8321349ffa0ee1d9c0286b03f6c (patch)
tree26deceb4dfb8e4912cacf0fc4107214641faaa80 /mkspecs
parentf41c900f0c72c1e1b08b9c64b0e3bf2b08ac50f9 (diff)
added QMAKE_MOC_OPTIONS variable to qmake
Merge-request: 41 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com> Change-Id: I8d492e9fbdbeeffa9f702a3a1f2fab314586809f Reviewed-on: http://codereview.qt-project.org/4375 Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com> Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/features/moc.prf4
1 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/features/moc.prf b/mkspecs/features/moc.prf
index d0b36e41b2..6468834319 100644
--- a/mkspecs/features/moc.prf
+++ b/mkspecs/features/moc.prf
@@ -45,10 +45,10 @@ defineReplace(mocCmdBase) {
contains(TEMPLATE, "vc.*") {
RET += $$mocinclude.commands
}
- RET += $$QMAKE_MOC $(DEFINES) @$$WIN_INCLUDETEMP $$join(QMAKE_COMPILER_DEFINES, " -D", -D)
+ RET += $$QMAKE_MOC $(DEFINES) @$$WIN_INCLUDETEMP $$join(QMAKE_COMPILER_DEFINES, " -D", -D) $$QMAKE_MOC_OPTIONS
return($$RET)
}
- return($$QMAKE_MOC $(DEFINES) $(INCPATH) $$join(QMAKE_COMPILER_DEFINES, " -D", -D))
+ return($$QMAKE_MOC $(DEFINES) $(INCPATH) $$join(QMAKE_COMPILER_DEFINES, " -D", -D) $$QMAKE_MOC_OPTIONS)
}
#moc headers