Merge remote-tracking branch 'origin/5.4' into 5.5

Conflicts:
	.qmake.conf

Change-Id: Ibd223399be3a6fd5442d5c141e8b285f168e2a42

1 files changed, 31 insertions, 0 deletions

diff --git a/dist/changes-5.4.2 b/dist/changes-5.4.2
new file mode 100644
index 00000000..a1afef1e
--- /dev/null
+++ b/dist/changes-5.4.2
@@ -0,0 +1,31 @@
+Qt 5.4.2 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.4.1.
+
+  http://doc.qt.io/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.io/
+
+Each of these identifiers can be entered in the bug tracker to obtain more
+information about a particular change.
+
+****************************************************************************
+*                          General                                         *
+****************************************************************************
+
+ - ComboBox
+   * [QTBUG-38612] Fixed editable ComboBox to open the popup when pressing
+     space.
+ - Menu
+   * Ignore non-visible menu popups on key navigation.
+   * [QTBUG-45228] Fixed menu popups to snap to one monitor instead of
+     crossing screen boundaries with multiple screens.
+   * [QTBUG-45182] Fixed a potential crash when a slot connected to
+     an action's triggered signal would end up processing pending events,
+     and effectively deleting the menu object while one of its QML signal
+     handlers was being executed.