summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoerg Bornemann <joerg.bornemann@qt.io>2016-11-24 16:53:53 +0100
committerJani Heikkinen <jani.heikkinen@qt.io>2016-11-30 08:29:18 +0000
commit6515d942aef76d7090e2421b85ac58eeae3614ea (patch)
tree158536595b69d5818576e56a9bbaaa738ddfb0f7
parentfe0b91879b672486ad9581e3fa577b4b32732ecc (diff)
Set a proper name for the moc_predefs extra compiler
In VS builds the default name is the first word of the command, in this case "cl". Use the generated file name instead. Change-Id: I8f0039eeae045f8b9a13caea8bd3e338bbe2ed17 Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
-rw-r--r--mkspecs/features/moc.prf1
1 files changed, 1 insertions, 0 deletions
diff --git a/mkspecs/features/moc.prf b/mkspecs/features/moc.prf
index dc14d71db7..4d3632531a 100644
--- a/mkspecs/features/moc.prf
+++ b/mkspecs/features/moc.prf
@@ -28,6 +28,7 @@ win32:count(MOC_INCLUDEPATH, 40, >) {
# UIKit builds are always multi-arch due to simulator_and_device (unless
# -sdk is used) so this feature cannot possibly work.
if(gcc|intel_icl|msvc):!rim_qcc:!uikit {
+ moc_predefs.name = "Generate moc_predefs.h"
moc_predefs.CONFIG = no_link
gcc: moc_predefs.commands = $$QMAKE_CXX $$QMAKE_CXXFLAGS -dM -E -o ${QMAKE_FILE_OUT} ${QMAKE_FILE_IN}
else:intel_icl: moc_predefs.commands = $$QMAKE_CXX $$QMAKE_CXXFLAGS -QdM -P -Fi${QMAKE_FILE_OUT} ${QMAKE_FILE_IN}