summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2018-01-18 11:00:49 +0100
committerLiang Qi <liang.qi@qt.io>2018-01-18 11:00:50 +0100
commitefb7c673cda85f7de1941e4fbf8e6cc4ad290a2d (patch)
tree56bbb0ad012781d8857a93cab5e7886e252d5ad0
parenta83a49aff24964803ddee737bd3b172ce3003290 (diff)
parent8668ce1602596ba1fa23afadad28083d5372f599 (diff)
downloadqtdoc-efb7c673cda85f7de1941e4fbf8e6cc4ad290a2d.tar.gz
Merge remote-tracking branch 'origin/5.9.4' into 5.9
Change-Id: Ifc2e3f0ccb56d2ae319d5a506073e95debdd2daa
-rw-r--r--dist/changes-5.9.425
-rw-r--r--doc/src/platforms/supported-platforms.qdocinc2
2 files changed, 26 insertions, 1 deletions
diff --git a/dist/changes-5.9.4 b/dist/changes-5.9.4
new file mode 100644
index 00000000..d49a42f5
--- /dev/null
+++ b/dist/changes-5.9.4
@@ -0,0 +1,25 @@
+Qt 5.9.4 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.9.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.9 series is binary compatible with the 5.8.x series.
+Applications compiled for 5.8 will continue to run with 5.9.
+
+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.
+
+****************************************************************************
+* Qt 5.9.4 Changes *
+****************************************************************************
+
+ - This release contains only minor code improvements.
+
diff --git a/doc/src/platforms/supported-platforms.qdocinc b/doc/src/platforms/supported-platforms.qdocinc
index 3b2a895c..3e7729a5 100644
--- a/doc/src/platforms/supported-platforms.qdocinc
+++ b/doc/src/platforms/supported-platforms.qdocinc
@@ -98,7 +98,7 @@ Mobile Platforms: \l {Qt for Android}{Android},
\l{Qt for VxWorks}{VxWorks}
\row \li \l {Qt for Embedded Linux}{Embedded Linux}
\li GCC \li ARM Cortex-A, Intel boards with GCC-based toolchains
- \row \li QNX 6.6.0, 7.0 (armv7le and x86)
+ \row \li QNX 6.6 (armv7le and x86), 7.0 (armv7le, arm64 and x86)
\li \b {GCC as provided by QNX}
\li Hosts: \b {RHEL 6.6 (64-bit)}, \b {RHEL 7.2 (64-bit)},
\b {Windows 10 (64-bit)}, \b {Windows 7 (32-bit)}