diff options
Diffstat (limited to 'sources/pyside6/PySide6/QtWebSockets')
| -rw-r--r-- | sources/pyside6/PySide6/QtWebSockets/CMakeLists.txt | 15 | ||||
| -rw-r--r-- | sources/pyside6/PySide6/QtWebSockets/typesystem_websockets.xml | 56 |
2 files changed, 14 insertions, 57 deletions
diff --git a/sources/pyside6/PySide6/QtWebSockets/CMakeLists.txt b/sources/pyside6/PySide6/QtWebSockets/CMakeLists.txt index 0166f5767..5ff07555b 100644 --- a/sources/pyside6/PySide6/QtWebSockets/CMakeLists.txt +++ b/sources/pyside6/PySide6/QtWebSockets/CMakeLists.txt @@ -1,9 +1,13 @@ +# Copyright (C) 2023 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + project(QtWebSockets) set(QtWebSockets_SRC ${QtWebSockets_GEN_DIR}/qmaskgenerator_wrapper.cpp ${QtWebSockets_GEN_DIR}/qwebsocket_wrapper.cpp ${QtWebSockets_GEN_DIR}/qwebsocketcorsauthenticator_wrapper.cpp +${QtWebSockets_GEN_DIR}/qwebsockethandshakeoptions_wrapper.cpp ${QtWebSockets_GEN_DIR}/qwebsocketprotocol_wrapper.cpp ${QtWebSockets_GEN_DIR}/qwebsocketserver_wrapper.cpp # module is always needed @@ -18,13 +22,10 @@ set(QtWebSockets_include_dirs ${QtWebSockets_SOURCE_DIR} ${libpyside_SOURCE_DIR} ${QtCore_GEN_DIR} ${QtWebSockets_GEN_DIR} - ${QtNetwork_GEN_DIR} - ) -set(QtWebSockets_libraries pyside6 - ${Qt${QT_MAJOR_VERSION}WebSockets_LIBRARIES} - ${Qt${QT_MAJOR_VERSION}Network_LIBRARIES} - ${Qt${QT_MAJOR_VERSION}Core_LIBRARIES} - ) + ${QtNetwork_GEN_DIR}) + +set(QtWebSockets_libraries pyside6 + ${Qt${QT_MAJOR_VERSION}WebSockets_LIBRARIES}) set(QtWebSockets_deps QtNetwork) diff --git a/sources/pyside6/PySide6/QtWebSockets/typesystem_websockets.xml b/sources/pyside6/PySide6/QtWebSockets/typesystem_websockets.xml index da1b78159..2d8d95898 100644 --- a/sources/pyside6/PySide6/QtWebSockets/typesystem_websockets.xml +++ b/sources/pyside6/PySide6/QtWebSockets/typesystem_websockets.xml @@ -1,45 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of Qt for Python. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2016 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only --> -<typesystem package="PySide6.QtWebSockets"> +<typesystem package="PySide6.QtWebSockets" + namespace-begin="QT_BEGIN_NAMESPACE" namespace-end="QT_END_NAMESPACE"> <load-typesystem name="QtCore/typesystem_core.xml" generate="no"/> <load-typesystem name="QtNetwork/typesystem_network.xml" generate="no"/> @@ -53,6 +18,8 @@ <object-type name="QWebSocketCorsAuthenticator"/> + <value-type name="QWebSocketHandshakeOptions" since="6.4"/> + <namespace-type name="QWebSocketProtocol"> <enum-type name="Version"/> <enum-type name="CloseCode"/> @@ -64,15 +31,4 @@ <include file-name="QWebSocketCorsAuthenticator" location="global"/> </extra-includes> </object-type> - - <!-- TODO: Gracefully handle the lack of SSL support --> - <rejection class="QWebSocket" function-name="ignoreSslErrors"/> - <rejection class="QWebSocket" function-name="setSslConfiguration"/> - <rejection class="QWebSocket" function-name="sslConfiguration"/> - <rejection class="QWebSocket" function-name="ignoreSslErrors"/> - <rejection class="QWebSocket" function-name="sslErrors"/> - <rejection class="QWebSocketServer" function-name="setSslConfiguration"/> - <rejection class="QWebSocketServer" function-name="sslConfiguration"/> - <rejection class="QWebSocketServer" function-name="peerVerifyError"/> - <rejection class="QWebSocketServer" function-name="sslErrors"/> </typesystem> |