diff options
Diffstat (limited to 'sources/pyside6/PySide6/QtConcurrent')
-rw-r--r-- | sources/pyside6/PySide6/QtConcurrent/CMakeLists.txt | 14 | ||||
-rw-r--r-- | sources/pyside6/PySide6/QtConcurrent/typesystem_concurrent.xml | 46 |
2 files changed, 13 insertions, 47 deletions
diff --git a/sources/pyside6/PySide6/QtConcurrent/CMakeLists.txt b/sources/pyside6/PySide6/QtConcurrent/CMakeLists.txt index b38849a75..134e44ed9 100644 --- a/sources/pyside6/PySide6/QtConcurrent/CMakeLists.txt +++ b/sources/pyside6/PySide6/QtConcurrent/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2023 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + project(QtConcurrent) set(QtConcurrent_SRC @@ -15,12 +18,11 @@ set(QtConcurrent_include_dirs ${QtConcurrent_SOURCE_DIR} ${Qt${QT_MAJOR_VERSION}Core_INCLUDE_DIRS} ${Qt${QT_MAJOR_VERSION}Concurrent_INCLUDE_DIRS} ${libpyside_SOURCE_DIR} - ${QtCore_GEN_DIR} - ) -set(QtConcurrent_libraries pyside6 - ${QtConcurrent_LIBRARIES} - ${Qt${QT_MAJOR_VERSION}Core_LIBRARIES} - ) + ${QtCore_GEN_DIR}) + +set(QtConcurrent_libraries pyside6 + ${Qt${QT_MAJOR_VERSION}Concurrent_LIBRARIES}) + set(QtConcurrent_deps QtCore) create_pyside_module(NAME QtConcurrent diff --git a/sources/pyside6/PySide6/QtConcurrent/typesystem_concurrent.xml b/sources/pyside6/PySide6/QtConcurrent/typesystem_concurrent.xml index 062482b9a..1892793b9 100644 --- a/sources/pyside6/PySide6/QtConcurrent/typesystem_concurrent.xml +++ b/sources/pyside6/PySide6/QtConcurrent/typesystem_concurrent.xml @@ -1,51 +1,16 @@ <?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.QtConcurrent"> +<typesystem package="PySide6.QtConcurrent" + namespace-begin="QT_BEGIN_NAMESPACE" namespace-end="QT_END_NAMESPACE"> <load-typesystem name="QtCore/typesystem_core.xml" generate="no"/> <!-- Qt5: this is currently the minimum possible QtConcurrent support, by just extracting the name space from QtCore --> <namespace-type name="QtConcurrent" target-type="class"> - <rejection class="QtConcurrent" enum-name="enum_1"/> + <enum-type name="FutureResult"/> <enum-type name="ReduceOption" flags="ReduceOptions"/> <enum-type name="ThreadFunctionResult"/> <extra-includes> @@ -56,7 +21,6 @@ <typedef-type name="QFutureVoid" source="QFuture<void>" disable-wrapper="yes"> <include file-name="QtCore/qfuture.h" location="global"/> - <modify-function signature="isResultReadyAt(int) const" remove="all"/> </typedef-type> <typedef-type name="QFutureQString" source="QFuture<QString>" disable-wrapper="yes"> <include file-name="QtCore/qfuture.h" location="global"/> |