Merge remote-tracking branch 'origin/5.9' into 5.10

 Conflicts:
	.qmake.conf

Change-Id: Ia803aad211281c71a8d13b403d83fb5ec3b2cb2c

1 files changed, 28 insertions, 0 deletions

diff --git a/dist/changes-5.9.4 b/dist/changes-5.9.4
new file mode 100644
index 000000000..9a713660a
--- /dev/null
+++ b/dist/changes-5.9.4
@@ -0,0 +1,28 @@
+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                           *
+****************************************************************************
+
+Build system
+------------
+
+ - [QTBUG-64317] Fixed qt5_add_translation() CMake macro for TS files whose
+   names contain multiple dots.