diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-13 10:27:53 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-10-13 10:27:53 +0200 |
| commit | 6702506920e61fe7af38222928528553c5a1f167 (patch) | |
| tree | 601a4661c4c8c78c80dd46ded8a1dfe0bb3d2678 /src | |
| parent | 6b058fbd8be8604d3796a4ae690c85482eb772ca (diff) | |
| parent | e32bcb7b714454f9167c4d49776a95c9a5799d70 (diff) | |
| download | qtenginio-6702506920e61fe7af38222928528553c5a1f167.tar.gz | |
Merge remote-tracking branch 'origin/1.2' into 5.6
Conflicts:
.qmake.conf
Change-Id: Icaade4d6cab13f7b8b7ffc3b8a759effe5aafaf9
Diffstat (limited to 'src')
| -rw-r--r-- | src/enginio_client/enginioclient.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/enginio_client/enginioclient.cpp b/src/enginio_client/enginioclient.cpp index dde8640..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. |