aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2021-05-27 16:05:37 +0200
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2021-05-28 11:14:45 +0200
commit0f973f90b19d83a1c4df15271d745184ae1cf247 (patch)
tree182a728653b9de180681a73ea88134de7713aaaa
parent76c6b9c85eb137670046c8bbb7e48a0d5f35edc6 (diff)
Remove unneeded per-platform typesystem files
Remove the per-platform typesystem files from QtWidgets and QtPrintSupport. It should not be necessary to repeat the Qt::HANDLE definition from QtCore. Keep the ones from QtCore and QtGui as they might be reused for native interfaces. Pick-to: 6.1 Task-number: PYSIDE-1568 Change-Id: I409fd7209c6ff130d1eef639398a57f19b25dcd5 Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io> Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
-rw-r--r--sources/pyside6/PySide6/QtGui/typesystem_gui_mac.xml6
-rw-r--r--sources/pyside6/PySide6/QtPrintSupport/CMakeLists.txt3
-rw-r--r--sources/pyside6/PySide6/QtPrintSupport/typesystem_printsupport.xml (renamed from sources/pyside6/PySide6/QtPrintSupport/typesystem_printsupport.xml.in)0
-rw-r--r--sources/pyside6/PySide6/QtWidgets/CMakeLists.txt3
-rw-r--r--sources/pyside6/PySide6/QtWidgets/typesystem_widgets.xml (renamed from sources/pyside6/PySide6/QtWidgets/typesystem_widgets.xml.in)1
-rw-r--r--sources/pyside6/PySide6/QtWidgets/typesystem_widgets_mac.xml46
-rw-r--r--sources/pyside6/PySide6/QtWidgets/typesystem_widgets_win.xml42
-rw-r--r--sources/pyside6/PySide6/QtWidgets/typesystem_widgets_x11.xml42
8 files changed, 1 insertions, 142 deletions
diff --git a/sources/pyside6/PySide6/QtGui/typesystem_gui_mac.xml b/sources/pyside6/PySide6/QtGui/typesystem_gui_mac.xml
index d2c6257c1..247bf8a51 100644
--- a/sources/pyside6/PySide6/QtGui/typesystem_gui_mac.xml
+++ b/sources/pyside6/PySide6/QtGui/typesystem_gui_mac.xml
@@ -39,8 +39,4 @@
**
****************************************************************************/
-->
-<typesystem package="PySide6.QtGui">
-
- <primitive-type name="Qt::HANDLE" target-lang-api-name="PyObject"/>
-
-</typesystem>
+<typesystem package="PySide6.QtGui"/>
diff --git a/sources/pyside6/PySide6/QtPrintSupport/CMakeLists.txt b/sources/pyside6/PySide6/QtPrintSupport/CMakeLists.txt
index f2e072fb4..70a3d8f67 100644
--- a/sources/pyside6/PySide6/QtPrintSupport/CMakeLists.txt
+++ b/sources/pyside6/PySide6/QtPrintSupport/CMakeLists.txt
@@ -13,9 +13,6 @@ ${QtPrintSupport_GEN_DIR}/qprintpreviewwidget_wrapper.cpp
${QtPrintSupport_GEN_DIR}/qtprintsupport_module_wrapper.cpp
)
-configure_file("${QtPrintSupport_SOURCE_DIR}/typesystem_printsupport.xml.in"
- "${QtPrintSupport_BINARY_DIR}/typesystem_printsupport.xml" @ONLY)
-
set(QtPrintSupport_include_dirs ${QtPrintSupport_SOURCE_DIR}
${QtPrintSupport_BINARY_DIR}
${Qt${QT_MAJOR_VERSION}Core_INCLUDE_DIRS}
diff --git a/sources/pyside6/PySide6/QtPrintSupport/typesystem_printsupport.xml.in b/sources/pyside6/PySide6/QtPrintSupport/typesystem_printsupport.xml
index f8c739897..f8c739897 100644
--- a/sources/pyside6/PySide6/QtPrintSupport/typesystem_printsupport.xml.in
+++ b/sources/pyside6/PySide6/QtPrintSupport/typesystem_printsupport.xml
diff --git a/sources/pyside6/PySide6/QtWidgets/CMakeLists.txt b/sources/pyside6/PySide6/QtWidgets/CMakeLists.txt
index 02813b4c2..fc1f9c12a 100644
--- a/sources/pyside6/PySide6/QtWidgets/CMakeLists.txt
+++ b/sources/pyside6/PySide6/QtWidgets/CMakeLists.txt
@@ -196,9 +196,6 @@ ${SPECIFIC_OS_FILES}
${QtWidgets_GEN_DIR}/qtwidgets_module_wrapper.cpp
)
-configure_file("${QtWidgets_SOURCE_DIR}/typesystem_widgets.xml.in"
- "${QtWidgets_BINARY_DIR}/typesystem_widgets.xml" @ONLY)
-
set(QtWidgets_include_dirs ${QtWidgets_SOURCE_DIR}
${QtWidgets_BINARY_DIR}
${pyside6_SOURCE_DIR}
diff --git a/sources/pyside6/PySide6/QtWidgets/typesystem_widgets.xml.in b/sources/pyside6/PySide6/QtWidgets/typesystem_widgets.xml
index 08020f157..dcd84ee04 100644
--- a/sources/pyside6/PySide6/QtWidgets/typesystem_widgets.xml.in
+++ b/sources/pyside6/PySide6/QtWidgets/typesystem_widgets.xml
@@ -41,6 +41,5 @@
-->
<typesystem package="PySide6.QtWidgets">
<load-typesystem name="QtGui/typesystem_gui.xml" generate="no"/>
- <load-typesystem name="QtWidgets/typesystem_widgets_@AUTO_OS@.xml" generate="yes"/>
<load-typesystem name="QtWidgets/typesystem_widgets_common.xml" generate="yes"/>
</typesystem>
diff --git a/sources/pyside6/PySide6/QtWidgets/typesystem_widgets_mac.xml b/sources/pyside6/PySide6/QtWidgets/typesystem_widgets_mac.xml
deleted file mode 100644
index dcf003501..000000000
--- a/sources/pyside6/PySide6/QtWidgets/typesystem_widgets_mac.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?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$
-**
-****************************************************************************/
--->
-<typesystem package="PySide6.QtWidgets">
-
- <primitive-type name="Qt::HANDLE" target-lang-api-name="PyObject"/>
-
-</typesystem>
diff --git a/sources/pyside6/PySide6/QtWidgets/typesystem_widgets_win.xml b/sources/pyside6/PySide6/QtWidgets/typesystem_widgets_win.xml
deleted file mode 100644
index 6b80b5537..000000000
--- a/sources/pyside6/PySide6/QtWidgets/typesystem_widgets_win.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?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$
-**
-****************************************************************************/
--->
-<typesystem package="PySide6.QtWidgets"/>
diff --git a/sources/pyside6/PySide6/QtWidgets/typesystem_widgets_x11.xml b/sources/pyside6/PySide6/QtWidgets/typesystem_widgets_x11.xml
deleted file mode 100644
index 6b80b5537..000000000
--- a/sources/pyside6/PySide6/QtWidgets/typesystem_widgets_x11.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?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$
-**
-****************************************************************************/
--->
-<typesystem package="PySide6.QtWidgets"/>