2d1195123e
Merge branch 'master' into AutomocIncludedDotMocFileHandling
...
Conflicts:
Source/cmTarget.cxx
2011-12-07 16:29:13 -05:00
62e223e8fa
automoc: add variable CMAKE_AUTOMOC_STRICT_MODE, to enable strict parsing
...
Alex
2011-12-02 22:08:06 +01:00
a8286235a3
moc is now part of the Qt5Core module
...
There is no separate SrcTools module anymore.
2011-11-26 15:15:33 +01:00
b8c8cab242
Merge remote-tracking branch 'origin/master' into automoc_qt5
2011-11-10 15:46:13 +01:00
812dab067e
Don't assume the existence of QT_MAJOR_VERSION.
...
Also handle Qt5SrcTools_MAJOR_VERSION.
2011-11-09 23:20:20 +01:00
52719a1d66
automoc: fix #12541 , support moc options
...
This commit adds a new target property AUTOMOC_MOC_OPTIONS, which
can be set to add extra options for the moc invocations done via automoc.
This is equivalent to the OPTIONS parameter in the qt4_wrap_cpp() macro.
Alex
2011-11-01 14:33:11 +01:00
126c6ead77
Add the cmake module required currently for automoc
...
Alex
2011-08-14 15:58:00 +02:00
David Cole
Alex Neundorf
Stephen Kelly