From 95655e87913556e69bdda4a9b3140da4602031e4 Mon Sep 17 00:00:00 2001 From: Milian Wolff Date: Thu, 6 Feb 2014 14:46:30 +0100 Subject: 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 --- src/websockets/qwebsocketprotocol_p.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src') 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); -- cgit v1.2.3