diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 10:24:21 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-04-08 10:24:21 +0200 |
commit | 00156d63eea2fb7681a8a00a3144392d6325e5cb (patch) | |
tree | 40f5159d523966cac856138a32d6d369c20b536b /src/websockets/qwebsocket_p.h | |
parent | c6d19a89046763f680d7f67c6f9989b4f51fc71e (diff) | |
parent | ba9306ec5a1271275d79b2f48ceb227f79352f33 (diff) | |
download | qtwebsockets-00156d63eea2fb7681a8a00a3144392d6325e5cb.tar.gz |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-beta1
Change-Id: I7ebcdc16a8b65103abfb9640c990eddbeccdef05
Diffstat (limited to 'src/websockets/qwebsocket_p.h')
-rw-r--r-- | src/websockets/qwebsocket_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/websockets/qwebsocket_p.h b/src/websockets/qwebsocket_p.h index 2c50083..139c7ff 100644 --- a/src/websockets/qwebsocket_p.h +++ b/src/websockets/qwebsocket_p.h @@ -147,6 +147,7 @@ public: void ignoreSslErrors(); void setSslConfiguration(const QSslConfiguration &sslConfiguration); QSslConfiguration sslConfiguration() const; + void _q_updateSslConfiguration(); #endif void closeGoingAway(); |