Details
-
Task
-
Resolution: Done
-
P3: Somewhat important
-
6.2.4, 6.3.0 RC
-
None
-
5
-
aa99bf532d (qt/qtbase/dev) aa99bf532d (qt/tqtc-qtbase/dev)
-
Team B Foundation Sprint 60, Foundation Sprint 61, Foundation Sprint 62, Foundation Sprint 63, Foundation Sprint 64, Foundation Sprint 65
Description
qdbusxml2cpp has a --moc/-m option, but that only tells it to add an #include "filename.moc", ie. the moc file for the implementation file, to the generated file.
What is missing is an option (--includemocs/-M) which includes the "moc_filename.cpp" file, ie. the moc file for the header file, too.
This will become important once we teach cmake or automoc to reject adding includes to mocs_compilation.cpp, in order to enforce includemocs at built time.
Acceptance criteria:
- qdbusxml2cpp has a new command line option (--includemocs/-M, naming subject to bikeshedding), which will include the moc file for the generated header into the generated cpp file.
- Use of the new switch is rolled out in at least qtconnectivity and qtbase
Attachments
Issue Links
- resulted from
-
QTBUG-103207 include moc files [QtConnectivity]
-
- Closed
-
For Gerrit Dashboard: QTBUG-103313 | ||||||
---|---|---|---|---|---|---|
# | Subject | Branch | Project | Status | CR | V |
410053,2 | bluez dbus files: adapt the generate script to recent changes | dev | qt/qtconnectivity | Status: MERGED | +2 | 0 |
410054,3 | bluez dbus files: work around qdbusxml2cpp's inability to includemocs | dev | qt/qtconnectivity | Status: MERGED | +2 | 0 |
421653,18 | qdbusxml2cpp: modify the behavior of -m/--moc option | dev | qt/qtbase | Status: MERGED | +2 | 0 |
430908,2 | Remove workaround from generator script | dev | qt/qtconnectivity | Status: MERGED | +2 | 0 |