diff options
| author | Daniel Molkentin <danimo@owncloud.com> | 2014-08-27 20:22:07 +0400 |
|---|---|---|
| committer | Daniel Molkentin <danimo@owncloud.com> | 2014-08-27 20:22:07 +0400 |
| commit | cf12a56b4c5a2372343e32898dba4f8881f439e8 (patch) | |
| tree | 08b1492873dd4e05f09729bd92095c9df6c4ced0 /src/gui/socketapi.h | |
| parent | 2c6324e3e5096af5199bd11e533921d106802ae6 (diff) | |
| parent | 928652e4cf62d918d9cbbdda0100bb4686c38ccd (diff) | |
Merge remote-tracking branch 'origin/1.7'
Conflicts:
src/gui/socketapi.cpp
Diffstat (limited to 'src/gui/socketapi.h')
| -rw-r--r-- | src/gui/socketapi.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/socketapi.h b/src/gui/socketapi.h index 4d7cd3ad2..e3fe37e27 100644 --- a/src/gui/socketapi.h +++ b/src/gui/socketapi.h @@ -59,6 +59,8 @@ private: Q_INVOKABLE void command_RETRIEVE_FOLDER_STATUS(const QString& argument, QTcpSocket* socket); Q_INVOKABLE void command_RETRIEVE_FILE_STATUS(const QString& argument, QTcpSocket* socket); + Q_INVOKABLE void command_VERSION(const QString& argument, QTcpSocket* socket); + private: QTcpServer *_localServer; QList<QTcpSocket*> _listeners; |