diff options
Diffstat (limited to 'sources/pyside6/PySide6/QtDesigner')
3 files changed, 24 insertions, 91 deletions
diff --git a/sources/pyside6/PySide6/QtDesigner/CMakeLists.txt b/sources/pyside6/PySide6/QtDesigner/CMakeLists.txt index 8764f7827..e91532b87 100644 --- a/sources/pyside6/PySide6/QtDesigner/CMakeLists.txt +++ b/sources/pyside6/PySide6/QtDesigner/CMakeLists.txt @@ -1,3 +1,6 @@ +# Copyright (C) 2023 The Qt Company Ltd. +# SPDX-License-Identifier: BSD-3-Clause + project(QtDesigner) qt_wrap_cpp(QtDesigner_static_src "${pyside6_SOURCE_DIR}/qpydesignerextensions.h") @@ -28,6 +31,7 @@ ${QtDesigner_GEN_DIR}/qdesignerwidgetboxinterface_category_wrapper.cpp ${QtDesigner_GEN_DIR}/qdesignerwidgetboxinterface_widget_wrapper.cpp ${QtDesigner_GEN_DIR}/qextensionmanager_wrapper.cpp ${QtDesigner_GEN_DIR}/qextensionfactory_wrapper.cpp +${QtDesigner_GEN_DIR}/qformbuilder_wrapper.cpp ${QtDesigner_GEN_DIR}/qpydesignercustomwidgetcollection_wrapper.cpp ${QtDesigner_GEN_DIR}/qpydesignercontainerextension_wrapper.cpp ${QtDesigner_GEN_DIR}/qpydesignermembersheetextension_wrapper.cpp @@ -47,14 +51,11 @@ set(QtDesigner_include_dirs ${QtDesigner_SOURCE_DIR} ${QtDesigner_BINARY_DIR} ${QtCore_GEN_DIR} ${QtGui_GEN_DIR} - ${QtWidgets_GEN_DIR} - ) + ${QtWidgets_GEN_DIR}) + set(QtDesigner_libraries pyside6 - ${Qt${QT_MAJOR_VERSION}Core_LIBRARIES} - ${Qt${QT_MAJOR_VERSION}Gui_LIBRARIES} - ${Qt${QT_MAJOR_VERSION}Widgets_LIBRARIES} - ${Qt${QT_MAJOR_VERSION}Designer_LIBRARIES} - ) + ${Qt${QT_MAJOR_VERSION}Designer_LIBRARIES}) + set(QtDesigner_deps QtWidgets) create_pyside_module(NAME QtDesigner diff --git a/sources/pyside6/PySide6/QtDesigner/qpydesignercustomwidgetcollection.cpp b/sources/pyside6/PySide6/QtDesigner/qpydesignercustomwidgetcollection.cpp index ee99396e1..31f8ec152 100644 --- a/sources/pyside6/PySide6/QtDesigner/qpydesignercustomwidgetcollection.cpp +++ b/sources/pyside6/PySide6/QtDesigner/qpydesignercustomwidgetcollection.cpp @@ -1,41 +1,5 @@ -/**************************************************************************** -** -** 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 #include <qpydesignerextensions.h> @@ -45,6 +9,8 @@ #include <shiboken.h> #include <bindingmanager.h> +QT_BEGIN_NAMESPACE + static QString pyStringToQString(PyObject *s) { const char *utf8 = _PepUnicode_AsString(s); @@ -253,3 +219,5 @@ void QPyDesignerCustomWidgetCollection::addCustomWidget(QDesignerCustomWidgetInt { instance()->m_customWidgets.append(c); } + +QT_END_NAMESPACE diff --git a/sources/pyside6/PySide6/QtDesigner/typesystem_designer.xml b/sources/pyside6/PySide6/QtDesigner/typesystem_designer.xml index ac574b5bc..7d37cbddf 100644 --- a/sources/pyside6/PySide6/QtDesigner/typesystem_designer.xml +++ b/sources/pyside6/PySide6/QtDesigner/typesystem_designer.xml @@ -1,46 +1,14 @@ <?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.QtDesigner"> +<typesystem package="PySide6.QtDesigner" + namespace-begin="QT_BEGIN_NAMESPACE" namespace-end="QT_END_NAMESPACE"> <load-typesystem name="QtWidgets/typesystem_widgets.xml" generate="no"/> + + <rejection class="qdesigner_internal"/> + <object-type name="QAbstractExtensionFactory"/> <object-type name="QAbstractExtensionManager"/> <object-type name="QAbstractFormBuilder"/> @@ -58,7 +26,6 @@ unexposed DomUI classes, we cannot generate a wrapper. --> <object-type name="QDesignerDnDItemInterface" disable-wrapper="yes"> <enum-type name="DropType"/> - <modify-function signature="QDesignerDnDItemInterface()" remove="all"/> </object-type> <object-type name="QDesignerDynamicPropertySheetExtension"/> <object-type name="QDesignerFormEditorInterface"/> @@ -71,7 +38,6 @@ <object-type name="QDesignerFormWindowInterface" disable-wrapper="yes"> <enum-type name="FeatureFlag" flags="Feature"/> <enum-type name="ResourceFileSaveMode"/> - <modify-function signature="QDesignerFormWindowInterface(QWidget*,QFlags<Qt::WindowType>)" remove="all"/> </object-type> <object-type name="QDesignerFormWindowManagerInterface"> <enum-type name="Action"/> @@ -93,6 +59,7 @@ </object-type> <object-type name="QExtensionManager"/> <object-type name="QExtensionFactory"/> + <object-type name="QFormBuilder"/> <object-type name="QPyDesignerCustomWidgetCollection" disable-wrapper="yes"> <extra-includes> <include file-name="qpydesignerextensions.h" location="global"/> @@ -103,14 +70,10 @@ </modify-argument> </modify-function> <!-- Force VARARGS/keyword arguments by giving a default parameters --> - <add-function signature='registerCustomWidget(PyObject*,const QString& @xml@ = {}, const QString& @tool_tip@ = {}, const QString& @group@ = {}, const QString& @module@ = {}, bool @container@ = false, const QString& @icon@ = {})' + <add-function signature='registerCustomWidget(PyObject*@customWidgetType@,const QString& @xml@ = {}, const QString& @tool_tip@ = {}, const QString& @group@ = {}, const QString& @module@ = {}, bool @container@ = false, const QString& @icon@ = {})' return-type='void' static='true'> - <modify-argument index="1"> - <rename to="customWidgetType"/> - </modify-argument> <inject-code class="target" position="beginning" file="../glue/qtdesigner.cpp" snippet="qtdesigner-registercustomwidget"/> </add-function> - <modify-function signature="QPyDesignerCustomWidgetCollection()" remove="all"/> </object-type> <object-type name="QPyDesignerContainerExtension"> <extra-includes> @@ -136,4 +99,5 @@ <!-- Suppress all QString */int * out parameters --> <suppress-warning text="^There's no user provided way.*handle the primitive type.*$"/> <suppress-warning text="^.*skipping abstract function.*QtResourceSet.*$"/> + <suppress-warning text="^.*skipping abstract function.*DomUI.*$"/> </typesystem> |