diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-12-17 16:44:57 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2014-12-17 16:44:57 +0100 |
| commit | e369af5feaaa769aacc8513301300df47babfbc2 (patch) | |
| tree | 80f1314106f32fe6aaedcdc61799d8e6d55371bf | |
| parent | 1b8225028d3e18ed912f41944e7a60679e3a5142 (diff) | |
| parent | 030a9c9a0d00bf15ea632d956c9c84535774dfe7 (diff) | |
Merge remote-tracking branch 'origin/5.4' into dev
Conflicts:
.qmake.conf
Change-Id: Ibbb51f63638ab198ebeae20bcc6fc7378378e1c4
| -rw-r--r-- | dist/changes-5.4.0 | 26 |
1 files changed, 26 insertions, 0 deletions
diff --git a/dist/changes-5.4.0 b/dist/changes-5.4.0 new file mode 100644 index 0000000..09a3482 --- /dev/null +++ b/dist/changes-5.4.0 @@ -0,0 +1,26 @@ +Qt 5.4 introduces many new features and improvements as well as bugfixes +over the 5.3.x series. For more details, refer to the online documentation +included in this distribution. The documentation is also available online: + + http://qt-project.org/doc/qt-5.4 + +The Qt version 5.4 series is binary compatible with the 5.3.x series. +Applications compiled for 5.3 will continue to run with 5.4. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + + http://bugreports.qt-project.org/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + +**************************************************************************** +* Library * +**************************************************************************** + +QtAndroidExtras +------------- + + - Notification example icon and documentation updated. + - QAndroidJniObject class documentation fixed. |