1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Document moc -f<...> behavior change in Qt-5.2.0

Browse Source 
Better late than never :)
Task-number: QTBUG-33749

Change-Id: I5035255e66a56754b609441f5b81ab119565a7cb
Reviewed-by: Olivier Goffart <ogoffart@woboq.com>
This commit is contained in:
David Faure 2014-02-07 14:42:05 +01:00 committed by The Qt Project
parent 1865104d9e
commit 5428db88de
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dist/changes-5.2.0 vendored
View File

@ -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).

2
src/tools/moc/main.cpp
View File

@ -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);