summaryrefslogtreecommitdiffstats
path: root/src/render
diff options
context:
space:
mode:
Diffstat (limited to 'src/render')
-rw-r--r--src/render/jobs/pickboundingvolumejob.cpp8
-rw-r--r--src/render/materialsystem/filterkey.cpp4
-rw-r--r--src/render/materialsystem/qparameter.cpp6
-rw-r--r--src/render/materialsystem/qshaderprogram.cpp4
-rw-r--r--src/render/picking/pickeventfilter.cpp4
-rw-r--r--src/render/shadergraph/qshadergraphloader.cpp12
-rw-r--r--src/render/shadergraph/qshadernodesloader.cpp12
-rw-r--r--src/render/texture/qtextureimagedata.h4
8 files changed, 0 insertions, 54 deletions
diff --git a/src/render/jobs/pickboundingvolumejob.cpp b/src/render/jobs/pickboundingvolumejob.cpp
index 6178bdee2..e8ec689aa 100644
--- a/src/render/jobs/pickboundingvolumejob.cpp
+++ b/src/render/jobs/pickboundingvolumejob.cpp
@@ -175,11 +175,7 @@ void PickBoundingVolumeJob::setRoot(Entity *root)
bool PickBoundingVolumeJob::processMouseEvent(QObject* object, QMouseEvent *event)
{
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
m_pendingMouseEvents.emplace_back(object, std::unique_ptr<QMouseEvent>(static_cast<QMouseEvent *>(event->clone())));
-#else
- m_pendingMouseEvents.emplace_back(object, new QMouseEvent(*event));
-#endif
return false;
}
@@ -383,11 +379,7 @@ void PickBoundingVolumeJob::dispatchPickEvents(const QMouseEvent *event,
localIntersection = entity->worldTransform()->inverted().map(hit.m_intersection);
QPickEventPtr pickEvent;
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
const auto eventPos = event->position();
-#else
- const auto eventPos = event->pos();
-#endif
switch (hit.m_type) {
case QCollisionQueryResult::Hit::Triangle:
pickEvent.reset(new QPickTriangleEvent(eventPos,
diff --git a/src/render/materialsystem/filterkey.cpp b/src/render/materialsystem/filterkey.cpp
index 7429735ef..24fd40121 100644
--- a/src/render/materialsystem/filterkey.cpp
+++ b/src/render/materialsystem/filterkey.cpp
@@ -56,11 +56,7 @@ bool FilterKey::equals(const FilterKey &other) const
// https://codereview.qt-project.org/#/c/204484/
// and adding the following early comparison of the types should give
// an equivalent performance gain:
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
return (other.value().metaType() == value().metaType() &&
-#else
- return (other.value().type() == value().type() &&
-#endif
other.name() == name() &&
other.value() == value());
}
diff --git a/src/render/materialsystem/qparameter.cpp b/src/render/materialsystem/qparameter.cpp
index 990f5ee1b..b49844d96 100644
--- a/src/render/materialsystem/qparameter.cpp
+++ b/src/render/materialsystem/qparameter.cpp
@@ -5,10 +5,8 @@
#include "qparameter_p.h"
#include <Qt3DRender/private/renderlogging_p.h>
#include <Qt3DRender/qtexture.h>
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
#include <QtCore/qiterable.h>
#include <QtCore/qsequentialiterable.h>
-#endif
/*!
\qmltype Parameter
@@ -163,11 +161,7 @@ inline QVariant toBackendValue(const QVariant &v)
void QParameterPrivate::setValue(const QVariant &v)
{
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
if (v.metaType().id() == QMetaType::QVariantList) {
-#else
- if (v.type() == QVariant::List) {
-#endif
QSequentialIterable iterable = v.value<QSequentialIterable>();
QVariantList variants;
variants.reserve(iterable.size());
diff --git a/src/render/materialsystem/qshaderprogram.cpp b/src/render/materialsystem/qshaderprogram.cpp
index cbb1b77b5..de1d56bb6 100644
--- a/src/render/materialsystem/qshaderprogram.cpp
+++ b/src/render/materialsystem/qshaderprogram.cpp
@@ -841,11 +841,7 @@ QByteArray QShaderProgramPrivate::resolveAutoBindingIndices(const QByteArray &co
do {
matchStart = shaderCode.indexOf(regexp, matchStart);
if (matchStart != -1) {
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
const auto match = regexp.matchView(QStringView{shaderCode}.mid(matchStart));
-#else
- const auto match = regexp.match(shaderCode.mid(matchStart));
-#endif
const auto length = match.capturedLength(0);
shaderCode.replace(matchStart, length, replacement.arg(variable++));
}
diff --git a/src/render/picking/pickeventfilter.cpp b/src/render/picking/pickeventfilter.cpp
index ca06dc090..e9f29de05 100644
--- a/src/render/picking/pickeventfilter.cpp
+++ b/src/render/picking/pickeventfilter.cpp
@@ -36,12 +36,8 @@ bool PickEventFilter::eventFilter(QObject *obj, QEvent *e)
case QEvent::HoverMove: {
QHoverEvent *he = static_cast<QHoverEvent *>(e);
auto mouseEvent = QMouseEvent(QEvent::MouseMove,
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
he->position(),
he->globalPosition(),
-#else
- he->pos(),
-#endif
Qt::NoButton, Qt::NoButton,
he->modifiers());
return m_aspect->processMouseEvent(obj, &mouseEvent);
diff --git a/src/render/shadergraph/qshadergraphloader.cpp b/src/render/shadergraph/qshadergraphloader.cpp
index 8194c8594..951f696c6 100644
--- a/src/render/shadergraph/qshadergraphloader.cpp
+++ b/src/render/shadergraph/qshadergraphloader.cpp
@@ -152,11 +152,7 @@ void QShaderGraphLoader::load()
if (parameterValue.isObject()) {
const QJsonObject parameterObject = parameterValue.toObject();
const QString type = parameterObject.value(QStringLiteral("type")).toString();
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
const QMetaType typeId = QMetaType::fromName(type.toUtf8());
-#else
- const QMetaType typeId(QMetaType::type(type.toUtf8()));
-#endif
const QString value = parameterObject.value(QStringLiteral("value")).toString();
auto variant = QVariant(value);
@@ -168,17 +164,9 @@ void QShaderGraphLoader::load()
const QMetaEnum metaEnum = metaObject->enumerator(metaObject->indexOfEnumerator(enumName));
const int enumValue = metaEnum.keyToValue(value.toUtf8());
variant = QVariant(enumValue);
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
variant.convert(typeId);
-#else
- variant.convert(typeId.id());
-#endif
} else {
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
variant.convert(typeId);
-#else
- variant.convert(typeId.id());
-#endif
}
node.setParameter(parameterName, variant);
} else {
diff --git a/src/render/shadergraph/qshadernodesloader.cpp b/src/render/shadergraph/qshadernodesloader.cpp
index c0d8dc703..44563bc43 100644
--- a/src/render/shadergraph/qshadernodesloader.cpp
+++ b/src/render/shadergraph/qshadernodesloader.cpp
@@ -126,11 +126,7 @@ void QShaderNodesLoader::load(const QJsonObject &prototypesObject)
if (parameterValue.isObject()) {
const QJsonObject parameterObject = parameterValue.toObject();
const QString type = parameterObject.value(QStringLiteral("type")).toString();
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
const QMetaType typeId = QMetaType::fromName(type.toUtf8());
-#else
- const QMetaType typeId(QMetaType::type(type.toUtf8()));
-#endif
const QString value = parameterObject.value(QStringLiteral("value")).toString();
auto variant = QVariant(value);
@@ -142,17 +138,9 @@ void QShaderNodesLoader::load(const QJsonObject &prototypesObject)
const QMetaEnum metaEnum = metaObject->enumerator(metaObject->indexOfEnumerator(enumName));
const int enumValue = metaEnum.keyToValue(value.toUtf8());
variant = QVariant(enumValue);
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
variant.convert(typeId);
-#else
- variant.convert(typeId.id());
-#endif
} else {
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
variant.convert(typeId);
-#else
- variant.convert(typeId.id());
-#endif
}
node.setParameter(parameterName, variant);
} else {
diff --git a/src/render/texture/qtextureimagedata.h b/src/render/texture/qtextureimagedata.h
index 3931a41e0..661958679 100644
--- a/src/render/texture/qtextureimagedata.h
+++ b/src/render/texture/qtextureimagedata.h
@@ -5,11 +5,7 @@
#define QT3DRENDER_TEXTUREIMAGEDATA_H
#include <Qt3DRender/qt3drender_global.h>
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
#include <QtOpenGL/qopengltexture.h>
-#else
-#include <QtGui/qopengltexture.h>
-#endif
#include <QtGui/QImage>
#include <QtCore/QSharedPointer>
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-13 09:15:59 +0000