diff options
author | Liang Qi <liang.qi@qt.io> | 2020-07-01 14:44:32 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2020-07-01 14:51:02 +0200 |
commit | e1c9c28c211cc5dc0e8c013f1ad07689efc4c90a (patch) | |
tree | 827f1157462ad173d5d43164d34fd610373f7293 | |
parent | a4ecddea4b6827a0779b5e653249f311f64b8fd1 (diff) | |
download | qtwebsockets-e1c9c28c211cc5dc0e8c013f1ad07689efc4c90a.tar.gz |
Update dependencies on 'dev' in qt/qtwebsockets
Also adapt to qtbase 45c0f45e04, Move QAlertLevel and QAlertType enums
into the namespace QSsl.
Change-Id: I3ddbbdaf22127fe0478ce7fac5879ed36bea0b30
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
-rw-r--r-- | dependencies.yaml | 4 | ||||
-rw-r--r-- | src/websockets/qsslserver_p.h | 4 | ||||
-rw-r--r-- | src/websockets/qwebsocket.cpp | 8 | ||||
-rw-r--r-- | src/websockets/qwebsocket.h | 4 | ||||
-rw-r--r-- | src/websockets/qwebsocketserver.h | 4 |
5 files changed, 12 insertions, 12 deletions
diff --git a/dependencies.yaml b/dependencies.yaml index 29b5395..624e4a2 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -1,7 +1,7 @@ dependencies: ../qtbase: - ref: ee6aadcff4576be50ffc953db2363522b86feb58 + ref: 836c0b5a24f5ceb8ed7dce0129f433bf23f58c25 required: true ../qtdeclarative: - ref: 5e12e609692f67f97339d556c9d8e5f50f50aae8 + ref: c50512fab3219f5d94a030227624f512756356c5 required: false diff --git a/src/websockets/qsslserver_p.h b/src/websockets/qsslserver_p.h index e0c77fa..4f1683a 100644 --- a/src/websockets/qsslserver_p.h +++ b/src/websockets/qsslserver_p.h @@ -78,8 +78,8 @@ Q_SIGNALS: void peerVerifyError(const QSslError &error); void newEncryptedConnection(); void preSharedKeyAuthenticationRequired(QSslPreSharedKeyAuthenticator *authenticator); - void alertSent(QAlertLevel level, QAlertType type, const QString &description); - void alertReceived(QAlertLevel level, QAlertType type, const QString &description); + void alertSent(QSsl::AlertLevel level, QSsl::AlertType type, const QString &description); + void alertReceived(QSsl::AlertLevel level, QSsl::AlertType type, const QString &description); void handshakeInterruptedOnError(const QSslError &error); void startedEncryptionHandshake(QSslSocket *socket); diff --git a/src/websockets/qwebsocket.cpp b/src/websockets/qwebsocket.cpp index cfb85f8..8381047 100644 --- a/src/websockets/qwebsocket.cpp +++ b/src/websockets/qwebsocket.cpp @@ -279,7 +279,7 @@ not been filled in with new information when the signal returns. \sa sslErrors() */ /*! - \fn void QWebSocket::alertSent(QAlertLevel level, QAlertType type, const QString &description) + \fn void QWebSocket::alertSent(QSsl::AlertLevel level, QSsl::AlertType type, const QString &description) \since 6.0 QWebSocket emits this signal if an alert message was sent to a peer. \a level @@ -291,10 +291,10 @@ not been filled in with new information when the signal returns. purposes, normally it does not require any actions from the application. \note Not all backends support this functionality. - \sa alertReceived(), QSslSocket::QAlertLevel, QSslSocket::QAlertType + \sa alertReceived(), QSsl::AlertLevel, QSsl::AlertType */ /*! - \fn void QWebSocket::alertReceived(QAlertLevel level, QAlertType type, const QString &description) + \fn void QWebSocket::alertReceived(QSsl::AlertLevel level, QSsl::AlertType type, const QString &description) \since 6.0 QWebSocket emits this signal if an alert message was received from a peer. @@ -307,7 +307,7 @@ not been filled in with new information when the signal returns. backend will handle it and close the connection. \note Not all backends support this functionality. - \sa alertSent(), QSslSocket::QAlertLevel, QSslSocket::QAlertType + \sa alertSent(), QSsl::AlertLevel, QSsl::AlertType */ /*! \fn void QWebSocket::handshakeInterruptedOnError(const QSslError &error) diff --git a/src/websockets/qwebsocket.h b/src/websockets/qwebsocket.h index 39698ff..18e8019 100644 --- a/src/websockets/qwebsocket.h +++ b/src/websockets/qwebsocket.h @@ -159,8 +159,8 @@ Q_SIGNALS: void peerVerifyError(const QSslError &error); void sslErrors(const QList<QSslError> &errors); void preSharedKeyAuthenticationRequired(QSslPreSharedKeyAuthenticator *authenticator); - void alertSent(QAlertLevel level, QAlertType type, const QString &description); - void alertReceived(QAlertLevel level, QAlertType type, const QString &description); + void alertSent(QSsl::AlertLevel level, QSsl::AlertType type, const QString &description); + void alertReceived(QSsl::AlertLevel level, QSsl::AlertType type, const QString &description); void handshakeInterruptedOnError(const QSslError &error); #endif diff --git a/src/websockets/qwebsocketserver.h b/src/websockets/qwebsocketserver.h index 478b35e..5c32ffb 100644 --- a/src/websockets/qwebsocketserver.h +++ b/src/websockets/qwebsocketserver.h @@ -158,8 +158,8 @@ Q_SIGNALS: void peerVerifyError(const QSslError &error); void sslErrors(const QList<QSslError> &errors); void preSharedKeyAuthenticationRequired(QSslPreSharedKeyAuthenticator *authenticator); - void alertSent(QAlertLevel level, QAlertType type, const QString &description); - void alertReceived(QAlertLevel level, QAlertType type, const QString &description); + void alertSent(QSsl::AlertLevel level, QSsl::AlertType type, const QString &description); + void alertReceived(QSsl::AlertLevel level, QSsl::AlertType type, const QString &description); void handshakeInterruptedOnError(const QSslError &error); #endif void closed(); |