36d524e6a3
In order for moc to properly parse #ifdefs and family, we've had QMAKE_COMPILER_DEFINES as a list of pre-defined macros from the compiler. That list is woefully incomplete. Instead, let's simply ask the compiler for the list. With GCC and family, we use the -dM flag while preprocessing. With ICC on Windows, the flag gains an extra "Q" but is otherwise the same. For MSVC, it requires using some undocumented switches and parsing environment variables (I've tested MSVC 2012, 2013 and 2015). The new moc option is called --include to be similar to GCC's -include option. It does more than just parse a list of pre-defined macros and can be used to insert any sort of code that moc needs to parse prior to the main file. Change-Id: I7de033f80b0e4431b7f1ffff13fca02dbb60a0a6 Reviewed-by: Olivier Goffart (Woboq GmbH) <ogoffart@woboq.com> |
||
---|---|---|
.. | ||
doc | ||
generators | ||
library | ||
cachekeys.h | ||
main.cpp | ||
Makefile.unix | ||
Makefile.win32 | ||
meta.cpp | ||
meta.h | ||
option.cpp | ||
option.h | ||
project.cpp | ||
project.h | ||
property.cpp | ||
property.h | ||
qmake_pch.h | ||
qmake-aux.pro | ||
qmake.pri | ||
qmake.pro |