diff options
Diffstat (limited to 'sources/pyside6/PySide6/QtBluetooth')
| -rw-r--r-- | sources/pyside6/PySide6/QtBluetooth/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | sources/pyside6/PySide6/QtBluetooth/typesystem_bluetooth.xml | 83 |
2 files changed, 39 insertions, 47 deletions
diff --git a/sources/pyside6/PySide6/QtBluetooth/CMakeLists.txt b/sources/pyside6/PySide6/QtBluetooth/CMakeLists.txt index 495ec16a5..e063a4546 100644 --- a/sources/pyside6/PySide6/QtBluetooth/CMakeLists.txt +++ b/sources/pyside6/PySide6/QtBluetooth/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2023 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + project(QtBluetooth) set(QtBluetooth_OPTIONAL_SRC ) diff --git a/sources/pyside6/PySide6/QtBluetooth/typesystem_bluetooth.xml b/sources/pyside6/PySide6/QtBluetooth/typesystem_bluetooth.xml index 2a1dded13..a3687b6b0 100644 --- a/sources/pyside6/PySide6/QtBluetooth/typesystem_bluetooth.xml +++ b/sources/pyside6/PySide6/QtBluetooth/typesystem_bluetooth.xml @@ -1,45 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- -/**************************************************************************** -** -** Copyright (C) 2021 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) 2021 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.QtBluetooth"> +<typesystem package="PySide6.QtBluetooth" + namespace-begin="QT_BEGIN_NAMESPACE" namespace-end="QT_END_NAMESPACE"> <load-typesystem name="QtCore/typesystem_core.xml" generate="no"/> <namespace-type name="QBluetooth"> <enum-type name="AttAccessConstraint" flags="AttAccessConstraints"/> @@ -53,7 +18,7 @@ <enum-type name="Pairing"/> </object-type> <object-type name="QBluetoothDeviceDiscoveryAgent"> - <enum-type name="DiscoveryMethod"/> + <enum-type name="DiscoveryMethod" flags="DiscoveryMethods"/> <enum-type name="Error"/> </object-type> <value-type name="QBluetoothDeviceInfo"> @@ -94,6 +59,28 @@ <enum-type name="DescriptorType"/> <enum-type name="ProtocolUuid"/> <enum-type name="ServiceClassUuid"/> + <modify-function signature="toUInt16(bool*)const"> + <modify-argument index="1"> + <remove-argument/> + </modify-argument> + <modify-argument index="return" pyi-type="Tuple[int, bool]"> + <replace-type modified-type="PyTuple"/> + </modify-argument> + <inject-code class="target" position="beginning"> + <insert-template name="fix_bool*"/> + </inject-code> + </modify-function> + <modify-function signature="toUInt32(bool*)const"> + <modify-argument index="1"> + <remove-argument/> + </modify-argument> + <modify-argument index="return" pyi-type="Tuple[int, bool]"> + <replace-type modified-type="PyTuple"/> + </modify-argument> + <inject-code class="target" position="beginning"> + <insert-template name="fix_bool*"/> + </inject-code> + </modify-function> </value-type> <value-type name="QLowEnergyAdvertisingData"> <enum-type name="Discoverability"/> @@ -103,10 +90,10 @@ <enum-type name="FilterPolicy"/> <enum-type name="Mode"/> </value-type> - <object-type name="QLowEnergyCharacteristic"> + <value-type name="QLowEnergyCharacteristic"> <enum-type name="PropertyType" flags="PropertyTypes"/> - </object-type> - <object-type name="QLowEnergyCharacteristicData"/> + </value-type> + <value-type name="QLowEnergyCharacteristicData"/> <value-type name="QLowEnergyConnectionParameters"/> <object-type name="QLowEnergyController"> <enum-type name="ControllerState"/> @@ -114,10 +101,8 @@ <enum-type name="RemoteAddressType"/> <enum-type name="Role"/> </object-type> - <object-type name="QLowEnergyDescriptor"> - </object-type> - <object-type name="QLowEnergyDescriptorData"> - </object-type> + <value-type name="QLowEnergyDescriptor"/> + <value-type name="QLowEnergyDescriptorData"/> <object-type name="QLowEnergyService"> <enum-type name="DiscoveryMode"/> <enum-type name="ServiceError"/> @@ -128,4 +113,8 @@ <value-type name="QLowEnergyServiceData"> <enum-type name="ServiceType"/> </value-type> + + <!-- QtNetwork is pulled in via QtBluetoothDepends. --> + <suppress-warning text="^Scoped enum 'Q(Ocsp)|(Dtls).*' does not have a type entry.*$"/> + </typesystem> |