Merge remote-tracking branch 'origin/stable' into dev

Change-Id: I5eed3f81fe220f82d1eba27d7e7a62803fea5e49

2 files changed, 29 insertions, 1 deletions

diff --git a/dist/changes-5.2.1 b/dist/changes-5.2.1
new file mode 100644
index 0000000..a01d53f
--- /dev/null
+++ b/dist/changes-5.2.1
@@ -0,0 +1,28 @@
+Qt 5.2.1 is a bug-fix release. It maintains both forward and backward
+compatibility (source and binary) with Qt 5.2.0.
+
+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.2
+
+The Qt version 5.2 series is binary compatible with the 5.1.x series.
+Applications compiled for 5.1 will continue to run with 5.2.
+
+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                                         *
+****************************************************************************
+
+ActiveQt
+--------
+
+ - [QTBUG-34989] ActiveQt now picks up plugins from deployment
+   location of Active X DLLs.
diff --git a/examples/activeqt/menus/doc/src/menus.qdoc b/examples/activeqt/menus/doc/src/menus.qdoc
index e9ce374..49a37bc 100644
--- a/examples/activeqt/menus/doc/src/menus.qdoc
+++ b/examples/activeqt/menus/doc/src/menus.qdoc
@@ -31,7 +31,7 @@
 
     \title Menubar Merging
 
-    This example is not full functional at the moment.
+    This example is not fully functional at the moment.
 
     \raw HTML
     <object ID="QMenus" CLASSID="CLSID:4dc3f340-a6f7-44e4-a79b-3e9217695fbd"