diff options
Diffstat (limited to 'sources/pyside6/PySide6/Qt3DAnimation/typesystem_3danimation.xml')
-rw-r--r-- | sources/pyside6/PySide6/Qt3DAnimation/typesystem_3danimation.xml | 55 |
1 files changed, 15 insertions, 40 deletions
diff --git a/sources/pyside6/PySide6/Qt3DAnimation/typesystem_3danimation.xml b/sources/pyside6/PySide6/Qt3DAnimation/typesystem_3danimation.xml index 433e37b2b..61af82d6d 100644 --- a/sources/pyside6/PySide6/Qt3DAnimation/typesystem_3danimation.xml +++ b/sources/pyside6/PySide6/Qt3DAnimation/typesystem_3danimation.xml @@ -1,50 +1,17 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- -/**************************************************************************** -** -** Copyright (C) 2017 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) 2017 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.Qt3DAnimation"> +<typesystem package="PySide6.Qt3DAnimation" + namespace-begin="QT_BEGIN_NAMESPACE" namespace-end="QT_END_NAMESPACE"> <load-typesystem name="Qt3DRender/typesystem_3drender.xml" generate="no"/> <namespace-type name="Qt3DAnimation"> <object-type name="QAbstractAnimation"> <enum-type name="AnimationType"/> + <!-- Disambiguate from QtCore/qabstractanimation.h --> + <include file-name="Qt3DAnimation/qabstractanimation.h" location="global"/> </object-type> <object-type name="QAbstractAnimationClip"/> <value-type name="QAnimationClipData" since="6.1"/> @@ -63,10 +30,18 @@ <enum-type name="Status"/> </object-type> <object-type name="QAnimationController"/> - <object-type name="QAnimationGroup"/> + <object-type name="QAnimationGroup"> + <!-- Disambiguate from QtCore/qanimationgroup.h --> + <include file-name="Qt3DAnimation/qanimationgroup.h" location="global"/> + </object-type> <object-type name="QBlendedClipAnimator"/> + <value-type name="QChannel"/> + <value-type name="QChannelComponent"/> + <object-type name="QCallbackMapping"/> <object-type name="QChannelMapper" since="6.1"/> + <object-type name="QChannelMapping"/> <object-type name="QClipAnimator"/> + <object-type name="QClipBlendValue"/> <object-type name="QClock"/> <object-type name="QKeyFrame"> <enum-type name="InterpolationType"/> |