diff options
Diffstat (limited to 'src/quick3d/quick3danimation')
8 files changed, 0 insertions, 39 deletions
diff --git a/src/quick3d/quick3danimation/items/quick3danimationcontroller.cpp b/src/quick3d/quick3danimation/items/quick3danimationcontroller.cpp index cae8c4971..77b25ae4a 100644 --- a/src/quick3d/quick3danimation/items/quick3danimationcontroller.cpp +++ b/src/quick3d/quick3danimation/items/quick3danimationcontroller.cpp @@ -15,12 +15,7 @@ QQuick3DAnimationController::QQuick3DAnimationController(QObject *parent) QQmlListProperty<QAnimationGroup> QQuick3DAnimationController::animationGroups() { -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) using qt_size_type = qsizetype; -#else - using qt_size_type = int; -#endif - using ListContentType = QAnimationGroup; auto appendFunction = [](QQmlListProperty<ListContentType> *list, ListContentType *bar) { QQuick3DAnimationController *controller = qobject_cast<QQuick3DAnimationController *>(list->object); diff --git a/src/quick3d/quick3danimation/items/quick3danimationgroup.cpp b/src/quick3d/quick3danimation/items/quick3danimationgroup.cpp index 383cdada4..d2bee0d7b 100644 --- a/src/quick3d/quick3danimation/items/quick3danimationgroup.cpp +++ b/src/quick3d/quick3danimation/items/quick3danimationgroup.cpp @@ -17,12 +17,7 @@ QQuick3DAnimationGroup::QQuick3DAnimationGroup(QObject *parent) QQmlListProperty<Qt3DAnimation::QAbstractAnimation> QQuick3DAnimationGroup::animations() { -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) using qt_size_type = qsizetype; -#else - using qt_size_type = int; -#endif - using ListContentType = Qt3DAnimation::QAbstractAnimation; auto appendFunction = [](QQmlListProperty<ListContentType> *list, ListContentType *animation) { QQuick3DAnimationGroup *animationGroup = qobject_cast<QQuick3DAnimationGroup *>(list->object); diff --git a/src/quick3d/quick3danimation/items/quick3dchannelmapper.cpp b/src/quick3d/quick3danimation/items/quick3dchannelmapper.cpp index 49dcb73da..16ea417d9 100644 --- a/src/quick3d/quick3danimation/items/quick3dchannelmapper.cpp +++ b/src/quick3d/quick3danimation/items/quick3dchannelmapper.cpp @@ -16,12 +16,7 @@ Quick3DChannelMapper::Quick3DChannelMapper(QObject *parent) QQmlListProperty<QAbstractChannelMapping> Quick3DChannelMapper::qmlMappings() { -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) using qt_size_type = qsizetype; -#else - using qt_size_type = int; -#endif - using ListContentType = QAbstractChannelMapping; auto appendFunction = [](QQmlListProperty<ListContentType> *list, ListContentType *mapping) { Quick3DChannelMapper *extension = qobject_cast<Quick3DChannelMapper *>(list->object); diff --git a/src/quick3d/quick3danimation/items/quick3dkeyframeanimation.cpp b/src/quick3d/quick3danimation/items/quick3dkeyframeanimation.cpp index 2d3542eaf..8bdeac896 100644 --- a/src/quick3d/quick3danimation/items/quick3dkeyframeanimation.cpp +++ b/src/quick3d/quick3danimation/items/quick3dkeyframeanimation.cpp @@ -15,12 +15,7 @@ QQuick3DKeyframeAnimation::QQuick3DKeyframeAnimation(QObject *parent) QQmlListProperty<Qt3DCore::QTransform> QQuick3DKeyframeAnimation::keyframes() { -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) using qt_size_type = qsizetype; -#else - using qt_size_type = int; -#endif - using ListContentType = Qt3DCore::QTransform; auto appendFunction = [](QQmlListProperty<ListContentType> *list, ListContentType *transform) { QQuick3DKeyframeAnimation *keyframeAnimation diff --git a/src/quick3d/quick3danimation/items/quick3dmorphinganimation.cpp b/src/quick3d/quick3danimation/items/quick3dmorphinganimation.cpp index 409e210d9..b35fef14a 100644 --- a/src/quick3d/quick3danimation/items/quick3dmorphinganimation.cpp +++ b/src/quick3d/quick3danimation/items/quick3dmorphinganimation.cpp @@ -15,12 +15,7 @@ QQuick3DMorphingAnimation::QQuick3DMorphingAnimation(QObject *parent) QQmlListProperty<Qt3DAnimation::QMorphTarget> QQuick3DMorphingAnimation::morphTargets() { -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) using qt_size_type = qsizetype; -#else - using qt_size_type = int; -#endif - using ListContentType = Qt3DAnimation::QMorphTarget; auto appendFunction = [](QQmlListProperty<ListContentType> *list, ListContentType *morphTarget) { QQuick3DMorphingAnimation *animation = qobject_cast<QQuick3DMorphingAnimation *>(list->object); diff --git a/src/quick3d/quick3danimation/items/quick3dmorphtarget.cpp b/src/quick3d/quick3danimation/items/quick3dmorphtarget.cpp index 5abc874a5..c6c779077 100644 --- a/src/quick3d/quick3danimation/items/quick3dmorphtarget.cpp +++ b/src/quick3d/quick3danimation/items/quick3dmorphtarget.cpp @@ -15,12 +15,7 @@ QQuick3DMorphTarget::QQuick3DMorphTarget(QObject *parent) QQmlListProperty<Qt3DCore::QAttribute> QQuick3DMorphTarget::attributes() { -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) using qt_size_type = qsizetype; -#else - using qt_size_type = int; -#endif - using ListContentType = Qt3DCore::QAttribute; auto appendFunction = [](QQmlListProperty<ListContentType> *list, ListContentType *bar) { QQuick3DMorphTarget *target = qobject_cast<QQuick3DMorphTarget *>(list->object); diff --git a/src/quick3d/quick3danimation/items/quick3dvertexblendanimation.cpp b/src/quick3d/quick3danimation/items/quick3dvertexblendanimation.cpp index c9f264ea0..9eef6740d 100644 --- a/src/quick3d/quick3danimation/items/quick3dvertexblendanimation.cpp +++ b/src/quick3d/quick3danimation/items/quick3dvertexblendanimation.cpp @@ -15,12 +15,7 @@ QQuick3DVertexBlendAnimation::QQuick3DVertexBlendAnimation(QObject *parent) QQmlListProperty<Qt3DAnimation::QMorphTarget> QQuick3DVertexBlendAnimation::morphTargets() { -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) using qt_size_type = qsizetype; -#else - using qt_size_type = int; -#endif - using ListContentType = Qt3DAnimation::QMorphTarget; auto appendFunction = [](QQmlListProperty<ListContentType> *list, ListContentType *morphTarget) { QQuick3DVertexBlendAnimation *animation diff --git a/src/quick3d/quick3danimation/qt3dquickanimationnodefactory.cpp b/src/quick3d/quick3danimation/qt3dquickanimationnodefactory.cpp index 706e55881..0c0d52ae1 100644 --- a/src/quick3d/quick3danimation/qt3dquickanimationnodefactory.cpp +++ b/src/quick3d/quick3danimation/qt3dquickanimationnodefactory.cpp @@ -28,11 +28,7 @@ Qt3DCore::QNode *QuickAnimationNodeFactory::createNode(const char *type) if (!typeInfo.resolved) { typeInfo.resolved = true; -#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0) typeInfo.t = QQmlMetaType::qmlType(QString::fromLatin1(typeInfo.quickName), QTypeRevision::fromVersion(typeInfo.version.first, typeInfo.version.second)); -#else - typeInfo.t = QQmlMetaType::qmlType(QString::fromLatin1(typeInfo.quickName), typeInfo.version.first, typeInfo.version.second); -#endif } return typeInfo.t.isValid() ? qobject_cast<Qt3DCore::QNode *>(typeInfo.t.create()) : nullptr; |