diff options
author | Liang Qi <liang.qi@qt.io> | 2016-05-24 19:59:38 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-05-24 19:59:38 +0200 |
commit | c18e9edf4cb97ab23d3975dfa03c524fbe619250 (patch) | |
tree | 53ff13348b9c7fee8fbde5140acc4ee4af798134 | |
parent | 9998820fd73978e7319233081e27e2ce94f61f5c (diff) | |
parent | 447947515df2cf727f14f5a1fdd4685ee8201e2f (diff) | |
download | qtactiveqt-c18e9edf4cb97ab23d3975dfa03c524fbe619250.tar.gz |
Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: Icae44481aae4bec9d70267f0006117652e7923a0
-rw-r--r-- | dist/changes-5.6.1 | 24 | ||||
-rw-r--r-- | dist/changes-5.7.0 | 22 | ||||
-rw-r--r-- | src/activeqt/doc/activeqt.qdocconf | 2 |
3 files changed, 46 insertions, 2 deletions
diff --git a/dist/changes-5.6.1 b/dist/changes-5.6.1 new file mode 100644 index 0000000..57adbce --- /dev/null +++ b/dist/changes-5.6.1 @@ -0,0 +1,24 @@ +Qt 5.6.1 is a bug-fix release. It maintains both forward and backward +compatibility (source and binary) with Qt 5.6.0. + +For more details, refer to the online documentation included in this +distribution. The documentation is also available online: + + http://doc.qt.io/qt-5/index.html + +The Qt version 5.6 series is binary compatible with the 5.5.x series. +Applications compiled for 5.5 will continue to run with 5.6. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + + https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + +**************************************************************************** +* Library * +**************************************************************************** + + - This release contains only minor code improvements. diff --git a/dist/changes-5.7.0 b/dist/changes-5.7.0 new file mode 100644 index 0000000..55ad36e --- /dev/null +++ b/dist/changes-5.7.0 @@ -0,0 +1,22 @@ +Qt 5.7 introduces many new features and improvements as well as bugfixes +over the 5.6.x series. For more details, refer to the online documentation +included in this distribution. The documentation is also available online: + + http://doc.qt.io/qt-5/index.html + +The Qt version 5.7 series is binary compatible with the 5.6.x series. +Applications compiled for 5.6 will continue to run with 5.7. + +Some of the changes listed in this file include issue tracking numbers +corresponding to tasks in the Qt Bug Tracker: + + https://bugreports.qt.io/ + +Each of these identifiers can be entered in the bug tracker to obtain more +information about a particular change. + +**************************************************************************** +* Library * +**************************************************************************** + + - This release contains only minor code improvements. diff --git a/src/activeqt/doc/activeqt.qdocconf b/src/activeqt/doc/activeqt.qdocconf index 2d41e63..09a48a3 100644 --- a/src/activeqt/doc/activeqt.qdocconf +++ b/src/activeqt/doc/activeqt.qdocconf @@ -4,8 +4,6 @@ project = ActiveQt description = ActiveQt version = $QT_VERSION -examplesinstallpath = qtactiveqt - qhp.projects = ActiveQt qhp.ActiveQt.file = activeqt.qhp |