diff options
| -rw-r--r-- | dist/changes-5.2.0 | 7 | ||||
| -rw-r--r-- | src/tools/moc/main.cpp | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/dist/changes-5.2.0 b/dist/changes-5.2.0 index 0e3f18929a..56997a11d4 100644 --- a/dist/changes-5.2.0 +++ b/dist/changes-5.2.0 @@ -768,3 +768,10 @@ X11 * [QTBUG-34392][MSVS] Fixed /SAFESEH:NO with VS2010+. * [QTBUG-34357][MSVS] Fixed breakage with multiple VS versions in PATH. * [MSVS] Fixed sub-project dependency generation. + +- moc + * Porting moc to QCommandLineParser has changed one specific option in its + command line handling: using the -f option without argument + is not supported anymore (it wasn't necessary, since including the header + file is the default behavior). + diff --git a/src/tools/moc/main.cpp b/src/tools/moc/main.cpp index 0a5f6ec241..9f5bd46ef4 100644 --- a/src/tools/moc/main.cpp +++ b/src/tools/moc/main.cpp @@ -258,7 +258,7 @@ int runMoc(int argc, char **argv) parser.addOption(pathPrefixOption); QCommandLineOption forceIncludeOption(QStringLiteral("f")); - forceIncludeOption.setDescription(QStringLiteral("Force #include [optional <file>] (overwrite default).")); + forceIncludeOption.setDescription(QStringLiteral("Force #include <file> (overwrite default).")); forceIncludeOption.setValueName(QStringLiteral("file")); parser.addOption(forceIncludeOption); |