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

Change-Id: Ia6e9b1180bd3125a40bf7f244fbf4c9b0e9766a2

src/activeqt/control/qaxbindable.cpp

@@ -252,7 +252,7 @@ bool QAxBindable::writeData(QIODevice *sink)
     in your subclass (unless you use QPointer), as the QWidget can
     be destroyed by the ActiveQt framework at any time.
 
-    \sa QAxBindable, QAxFactory, {Qt's ActiveX Framework (ActiveQt)}
+    \sa QAxBindable, QAxFactory, {Active Qt}
 */
 
 /*!

src/activeqt/doc/activeqt.qdocconf

@@ -32,7 +32,7 @@ qhp.ActiveQt.subprojects.qaxserverclasses.sortPages = true
 
 tagfile                 = ../../../doc/activeqt/activeqt.tags
 
-depends                 += qtcore qtgui qtdoc
+depends                 += qtcore qtdesigner qtdoc qtopengl qtscript qtwidgets
 
 headerdirs  += ..
 

src/activeqt/doc/src/examples/dotnet.qdoc

@@ -306,7 +306,7 @@
     since this includes subclasses of QObject and QWidget we can wrap
     any of our datatypes into a QObject subclass to make its API
     available to .NET. This has the positive side effect that the same
-    API is automatically available when using \l QtScript to automate
+    API is automatically available when using \l {Qt Script} to automate
     Qt applications and to COM clients in general.
 
     When using the "IJW" method, in principle the only limitation is the