diff options
| author | David Faure <david.faure@kdab.com> | 2014-02-07 14:42:05 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-11 12:59:08 +0100 |
| commit | 5428db88de40378d0419aea40515d98241d733bc (patch) | |
| tree | ab14d862486c350213fe585e6c85f71c38222f14 | |
| parent | 1865104d9e937a6fa643a20f68a7b13f2acb0319 (diff) | |
Document `moc -f<...>` behavior change in Qt-5.2.0
Better late than never :)
Task-number: QTBUG-33749
Change-Id: I5035255e66a56754b609441f5b81ab119565a7cb
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
| -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); |