diff options
| author | Andrew Branson <andrew.branson@cern.ch> | 2016-02-18 16:57:06 +0100 |
|---|---|---|
| committer | Andrew Branson <andrew.branson@cern.ch> | 2016-02-18 16:57:06 +0100 |
| commit | bd34e5b5ab78e15ee1433a7fbd1dfe2b672fef7f (patch) | |
| tree | ea6d65880e7fb822d198db029fb90b1dab1b1ad8 /rockworkd/libpebble/jskit/jskitpebble.h | |
| parent | b9e47c9b12a54bef3cd5e21b93c85210e6abf227 (diff) | |
Ifdefed the WebSocket stuff that doesn't exist on Sailfish
Voice calls nearly working, except for a segfault on callEnded, which
might be a reentrant thing.
Diffstat (limited to 'rockworkd/libpebble/jskit/jskitpebble.h')
| -rw-r--r-- | rockworkd/libpebble/jskit/jskitpebble.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/rockworkd/libpebble/jskit/jskitpebble.h b/rockworkd/libpebble/jskit/jskitpebble.h index c461adb..836a08f 100644 --- a/rockworkd/libpebble/jskit/jskitpebble.h +++ b/rockworkd/libpebble/jskit/jskitpebble.h @@ -32,8 +32,9 @@ public: Q_INVOKABLE void openURL(const QUrl &url); Q_INVOKABLE QJSValue createXMLHttpRequest(); +#if QT_VERSION >= 0x050300 Q_INVOKABLE QJSValue createWebSocket(const QString &url, const QJSValue &protocols=QJSValue{}); - +#endif void invokeCallbacks(const QString &type, const QJSValueList &args = QJSValueList()); private: |