From b2780e60c7f4e8321349ffa0ee1d9c0286b03f6c Mon Sep 17 00:00:00 2001
From: Keno Fischer <kenof@stanford.edu>
Date: Wed, 7 Sep 2011 18:58:40 +0200
Subject: 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>
---
 mkspecs/features/moc.prf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'mkspecs')

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
-- 
cgit v1.2.3