diff options
| author | Milian Wolff <mail@milianw.de> | 2014-02-06 14:46:30 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-06 20:17:02 +0100 |
| commit | 95655e87913556e69bdda4a9b3140da4602031e4 (patch) | |
| tree | b966ccb163f8b888fbc699c69d7dd3540d705bca | |
| parent | 0a9ea1ed6f2c201445381be62305a5e8b889f321 (diff) | |
| download | qtwebsockets-95655e87913556e69bdda4a9b3140da4602031e4.tar.gz | |
Fix compilation of websocketprotocol test.
The versionFromString method must be exported for usage in the test.
Additionally, the metatype of the version enum must be declared.
Change-Id: I8e0aef28f9902f274cab43f772667ad5a93c4062
Reviewed-by: Kurt Pattyn <pattyn.kurt@gmail.com>
| -rw-r--r-- | src/websockets/qwebsocketprotocol_p.h | 2 | ||||
| -rw-r--r-- | tests/auto/websocketprotocol/tst_websocketprotocol.cpp | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/websockets/qwebsocketprotocol_p.h b/src/websockets/qwebsocketprotocol_p.h index 8850c4d..93ba7b9 100644 --- a/src/websockets/qwebsocketprotocol_p.h +++ b/src/websockets/qwebsocketprotocol_p.h @@ -87,7 +87,7 @@ inline bool isCloseCodeValid(int closeCode) } inline Version currentVersion() { return VersionLatest; } -Version versionFromString(const QString &versionString); +Version Q_AUTOTEST_EXPORT versionFromString(const QString &versionString); void Q_AUTOTEST_EXPORT mask(QByteArray *payload, quint32 maskingKey); void Q_AUTOTEST_EXPORT mask(char *payload, quint64 size, quint32 maskingKey); diff --git a/tests/auto/websocketprotocol/tst_websocketprotocol.cpp b/tests/auto/websocketprotocol/tst_websocketprotocol.cpp index b8948d5..5fae50f 100644 --- a/tests/auto/websocketprotocol/tst_websocketprotocol.cpp +++ b/tests/auto/websocketprotocol/tst_websocketprotocol.cpp @@ -51,6 +51,7 @@ QT_USE_NAMESPACE Q_DECLARE_METATYPE(QWebSocketProtocol::CloseCode) Q_DECLARE_METATYPE(QWebSocketProtocol::OpCode) +Q_DECLARE_METATYPE(QWebSocketProtocol::Version) class tst_WebSocketProtocol : public QObject { |