diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-05-23 21:27:07 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-05-23 21:27:07 +0200 |
| commit | d3a8bc803cd7c4ce106038bfc4b37cdd6bb8e177 (patch) | |
| tree | 3b6db0d4869f334d0eb4559c5ae457995cbe913e /dist/changes-5.0.0 | |
| parent | d934ddc297f6db94dbc548fe01da64350f13577d (diff) | |
| parent | 47a7628023610904c6ac52e23fa289f75f349b4e (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/corelib/io/qdatastream.cpp
src/corelib/io/qdatastream.h
src/corelib/json/qjsonwriter.cpp
src/plugins/platforms/cocoa/qcocoawindow.mm
src/plugins/platforms/xcb/qxcbkeyboard.cpp
Change-Id: I46fef1455f5a9f2ce1ec394a3c65881093c51b62
Diffstat (limited to 'dist/changes-5.0.0')
| -rw-r--r-- | dist/changes-5.0.0 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/dist/changes-5.0.0 b/dist/changes-5.0.0 index 6d58c21133..85c41c7f55 100644 --- a/dist/changes-5.0.0 +++ b/dist/changes-5.0.0 @@ -945,7 +945,7 @@ Qt for Windows CE * QMAKE_SUBSTITUTES can now copy files verbatim. * MSVC desktop builds now use -Zc:wchar_t. * The following variables were added: QMAKESPEC, _QMAKE_CONF_ & _QMAKE_SUPER_CACHE_. - * QDBUSXML2CPP_{INTERFACES,ADAPTORS}_{HEADER,SOURCE}_FLAGS are now understood, + * QDBUSXML2CPP_{INTERFACE,ADAPTOR}_{HEADER,SOURCE}_FLAGS are now understood, and DBUS_{INTERFACES,ADAPTORS} support file groups with individual flags now. * QT_PRIVATE and PKGCONFIG_PRIVATE (analogous to LIBS_PRIVATE resp. PKGCONFIG) are now understood. * INSTALLS entries now support copying with subdirectory (e.g., entry.base = $$dirname(PWD)). |