diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-12 16:28:07 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-02-12 16:28:07 +0100 |
commit | a9c88c1f39c41215eb9d7288a1fd02aa865e8a04 (patch) | |
tree | d6229a2370f202d5ff8a5f56da1f43982bc524c2 /dist | |
parent | ff23fb6cf723bcc52a5f037ef92500c480ce5a5c (diff) | |
parent | 8e22d71b225576ae7ccd6ed349c05219bae7689e (diff) |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/gui/image/qimage.cpp
src/gui/text/qtextengine.cpp
src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp
src/printsupport/kernel/qprintengine_win.cpp
Change-Id: I09ce991a57f39bc7b1ad6978d0e0d858df0cd444
Diffstat (limited to 'dist')
-rw-r--r-- | dist/changes-5.2.0 | 7 |
1 files changed, 7 insertions, 0 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). + |