Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-alpha1

Conflicts:
	.qmake.conf

Change-Id: I06247d29c4b05020e91bb377a7f93e5374184f47

1 files changed, 3 insertions, 0 deletions

diff --git a/examples/activeqt/simple/doc/src/simple.qdoc b/examples/activeqt/simple/doc/src/simple.qdoc
index dbfc0bd..76ac4ea 100644
--- a/examples/activeqt/simple/doc/src/simple.qdoc
+++ b/examples/activeqt/simple/doc/src/simple.qdoc
@@ -74,6 +74,9 @@
     \example activeqt/simple
     \title Simple Example (ActiveQt)
 
+    \brief The Simple example demonstrates the use
+    of QAxBindable and QAxFactory.
+
     The Simple example demonstrates the use of
     QAxBindable::requestPropertyChange() and QAxBindable::propertyChanged(),
     and the use of QAxFactory through the \c QAXFACTORY_BEGIN(),