diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-05-27 09:56:14 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-06-09 17:05:15 +0200 |
| commit | f8a891f3d2b833747d575d92de99dfb27396a355 (patch) | |
| tree | dedeabfc5c01ed198549d493cbb91461b04d87a1 /sources/pyside6/PySide6/QtCore/typesystem_core.xml.in | |
| parent | 77669e48fd8ac0f4ca199173672c4bf0c9dc654b (diff) | |
Use conditional processing in the type system
In CMake, remove the AUTO_OS variable from the check_os() macro. Fold
the macOS/X11 type system files of Qt Core into the common type system
file.
Task-number: PYSIDE-802
Task-number: PYSIDE-1568
Change-Id: Ib751f40fbf7eca8fe4d08270db4fbc1e938323c5
Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'sources/pyside6/PySide6/QtCore/typesystem_core.xml.in')
| -rw-r--r-- | sources/pyside6/PySide6/QtCore/typesystem_core.xml.in | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/sources/pyside6/PySide6/QtCore/typesystem_core.xml.in b/sources/pyside6/PySide6/QtCore/typesystem_core.xml.in deleted file mode 100644 index cebafdcc6..000000000 --- a/sources/pyside6/PySide6/QtCore/typesystem_core.xml.in +++ /dev/null @@ -1,45 +0,0 @@ -<?xml version="1.0"?> -<!-- -/**************************************************************************** -** -** 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.QtCore"> - <load-typesystem name="QtCore/typesystem_core_@AUTO_OS@.xml" generate="yes"/> - <load-typesystem name="QtCore/typesystem_core_common.xml" generate="yes"/> -</typesystem> |