diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-14 19:53:40 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-14 19:53:40 +0200 |
commit | ea2f8a119986979465d3679b9c03469ed529d4f6 (patch) | |
tree | ca6f5ac002ddd2240deca80090be8a6da7e9035e /src/enginio_client/enginioclient.cpp | |
parent | f85090348e01b8d7d7955dcf844196d5e2070faa (diff) | |
parent | 6702506920e61fe7af38222928528553c5a1f167 (diff) | |
download | qtenginio-ea2f8a119986979465d3679b9c03469ed529d4f6.tar.gz |
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts:
.qmake.conf
Change-Id: I22f4404e29faf0a8688d768341af7dad43c46e49
Diffstat (limited to 'src/enginio_client/enginioclient.cpp')
-rw-r--r-- | src/enginio_client/enginioclient.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/enginio_client/enginioclient.cpp b/src/enginio_client/enginioclient.cpp index afdd1f6..4302285 100644 --- a/src/enginio_client/enginioclient.cpp +++ b/src/enginio_client/enginioclient.cpp @@ -53,6 +53,7 @@ QT_BEGIN_NAMESPACE /*! \module enginio-client \title Enginio Client Interface + \qtvariable enginio This interface provides access to the Enginio service through a set of C++ classes based on Qt. @@ -63,7 +64,7 @@ QT_BEGIN_NAMESPACE \since 5.3 \inmodule enginio-qt \ingroup enginio-client - \target EnginioClientCpp + \keyword EnginioClientCpp \brief EnginioClient handles all communication with the Enginio server The Enginio server supports several separate "backends" with each account. |