Surprisingly, moc had no awareness of constexpr at all. This would still mostly work, as we were just skipping it, except for the case where constexpr appears as the last keyword – in which case we'd pick it up as the type name. Fix this by adding constexpr as a known token, and add it to the list of things we ignore in testForFunctionModifiers. Pick-to: 6.5 Fixes: QTBUG-122609 Change-Id: I0ae0c0477e611ff83fbb841233035bea52216be2 Reviewed-by: Ulf Hermann <ulf.hermann@qt.io> (cherry picked from commit 984ad9019a62a9a130647dbd765e38ee2e6250c1) Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> |
||
|---|---|---|
| .. | ||
| macdeployqt | ||
| moc | ||
| qdbuscpp2xml | ||
| qdbusxml2cpp | ||
| qmake | ||
| qmakelib | ||
| qt_cmake_create | ||
| rcc | ||
| uic | ||
| windeployqt | ||
| CMakeLists.txt | ||