summaryrefslogtreecommitdiffstats
path: root/src/quick3d/quick3dextras
diff options
context:
space:
mode:
Diffstat (limited to 'src/quick3d/quick3dextras')
-rw-r--r--src/quick3d/quick3dextras/items/items.pri10
-rw-r--r--src/quick3d/quick3dextras/items/quick3dspritesheet.cpp5
-rw-r--r--src/quick3d/quick3dextras/qt3dquickextrasnodefactory.cpp4
-rw-r--r--src/quick3d/quick3dextras/quick3dextras.pro29
4 files changed, 0 insertions, 48 deletions
diff --git a/src/quick3d/quick3dextras/items/items.pri b/src/quick3d/quick3dextras/items/items.pri
deleted file mode 100644
index f2fe09dcb..000000000
--- a/src/quick3d/quick3dextras/items/items.pri
+++ /dev/null
@@ -1,10 +0,0 @@
-HEADERS += \
- $$PWD/quick3dlevelofdetailloader_p.h \
- $$PWD/quick3dlevelofdetailloader_p_p.h \
- $$PWD/quick3dspritesheet_p.h
-
-SOURCES += \
- $$PWD/quick3dlevelofdetailloader.cpp \
- $$PWD/quick3dspritesheet.cpp
-
-INCLUDEPATH += $$PWD
diff --git a/src/quick3d/quick3dextras/items/quick3dspritesheet.cpp b/src/quick3d/quick3dextras/items/quick3dspritesheet.cpp
index facdf9a01..1dd2a22b6 100644
--- a/src/quick3d/quick3dextras/items/quick3dspritesheet.cpp
+++ b/src/quick3d/quick3dextras/items/quick3dspritesheet.cpp
@@ -21,12 +21,7 @@ Quick3DSpriteSheet::~Quick3DSpriteSheet()
QQmlListProperty<Qt3DExtras::QSpriteSheetItem> Quick3DSpriteSheet::sprites()
{
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
using qt_size_type = qsizetype;
-#else
- using qt_size_type = int;
-#endif
-
using ListContentType = Qt3DExtras::QSpriteSheetItem;
auto appendFunction = [](QQmlListProperty<ListContentType> *list, ListContentType *sprite) {
Quick3DSpriteSheet *spritesheet = qobject_cast<Quick3DSpriteSheet *>(list->object);
diff --git a/src/quick3d/quick3dextras/qt3dquickextrasnodefactory.cpp b/src/quick3d/quick3dextras/qt3dquickextrasnodefactory.cpp
index 33b6810ea..81e0f251c 100644
--- a/src/quick3d/quick3dextras/qt3dquickextrasnodefactory.cpp
+++ b/src/quick3d/quick3dextras/qt3dquickextrasnodefactory.cpp
@@ -28,11 +28,7 @@ Qt3DCore::QNode *QuickExtrasNodeFactory::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;
diff --git a/src/quick3d/quick3dextras/quick3dextras.pro b/src/quick3d/quick3dextras/quick3dextras.pro
deleted file mode 100644
index c57e7af0c..000000000
--- a/src/quick3d/quick3dextras/quick3dextras.pro
+++ /dev/null
@@ -1,29 +0,0 @@
-TARGET = Qt3DQuickExtras
-MODULE = 3dquickextras
-
-QT += core core-private qml qml-private 3dcore 3dinput 3dquick 3dquick-private 3drender 3drender-private 3dlogic 3dextras 3dextras-private
-
-CONFIG -= precompile_header
-
-gcov {
- QMAKE_CXXFLAGS += -fprofile-arcs -ftest-coverage
- QMAKE_LFLAGS += -fprofile-arcs -ftest-coverage
-}
-
-SOURCES += \
- qt3dquickextras_global.cpp \
- qt3dquickextrasnodefactory.cpp \
- qt3dquickwindow.cpp \
- qt3dquickwindowlogging.cpp
-
-HEADERS += \
- qt3dquickextras_global.h \
- qt3dquickextras_global_p.h \
- qt3dquickextrasnodefactory_p.h \
- qt3dquickwindow.h \
- qt3dquickwindow_p.h \
- qt3dquickwindowlogging_p.h
-
-include(./items/items.pri)
-
-load(qt_module)