summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2014-05-14 12:39:46 +0200
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2014-05-14 12:39:46 +0200
commitcfbeb417ec6c7d827cd06de1025e83dface28937 (patch)
tree69c0c9bbf05f560b4d9d3c008e0c7870c8fdebb8
parent1d2b476a11a6c00c5ec03454d232b796e48a872c (diff)
parente5ae557f99f959c582ee5897c786e1d4c1e0c5ee (diff)
downloadqtenginio-cfbeb417ec6c7d827cd06de1025e83dface28937.tar.gz
Merge remote-tracking branch 'origin/release' into stable
Change-Id: I9938394603201db675944a2c0f9512bbd9e06646
-rw-r--r--src/enginio_client/doc/enginio_client.qdoc6
-rw-r--r--src/enginio_client/enginioclient.cpp1
2 files changed, 6 insertions, 1 deletions
diff --git a/src/enginio_client/doc/enginio_client.qdoc b/src/enginio_client/doc/enginio_client.qdoc
index fb77b4f..bdd492f 100644
--- a/src/enginio_client/doc/enginio_client.qdoc
+++ b/src/enginio_client/doc/enginio_client.qdoc
@@ -31,7 +31,11 @@
\inmodule enginio-qt
\ingroup modules
-Enginio provides these \b{C++ classes}:
+\section1 Namespaces
+
+\annotatedlist enginio-namespace
+
+\section1 Classes
\generatelist {classesbymodule enginio-qt}
List of examples:
diff --git a/src/enginio_client/enginioclient.cpp b/src/enginio_client/enginioclient.cpp
index 65bae2c..6a47696 100644
--- a/src/enginio_client/enginioclient.cpp
+++ b/src/enginio_client/enginioclient.cpp
@@ -116,6 +116,7 @@ QT_BEGIN_NAMESPACE
/*!
\namespace Enginio
\inmodule enginio-qt
+ \ingroup enginio-namespace
\brief The Enginio namespace provides enums used throughout Enginio.
*/