summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/core/core-components/qcamera.cpp2
-rw-r--r--src/core/core-components/qcamera.h2
-rw-r--r--src/core/nodes/qnode.h6
-rw-r--r--src/core/nodes/qnode_p.h2
-rw-r--r--src/core/services/qservicelocator.h4
-rw-r--r--src/input/q3dkeyevent.h4
-rw-r--r--src/render/backend/quniformvalue_p.h2
-rw-r--r--src/render/backend/renderannotation_p.h2
-rw-r--r--src/render/backend/rendereffect_p.h2
-rw-r--r--src/render/backend/rendershader_p.h2
-rw-r--r--src/render/backend/rendertechnique_p.h2
-rw-r--r--src/render/frontend/qabstractsceneloader.h2
-rw-r--r--src/render/frontend/qcylindermesh.cpp2
-rw-r--r--src/render/frontend/qspheremesh.cpp2
-rw-r--r--sync.profile8
15 files changed, 21 insertions, 23 deletions
diff --git a/src/core/core-components/qcamera.cpp b/src/core/core-components/qcamera.cpp
index 81c2f4cce..c96f58db6 100644
--- a/src/core/core-components/qcamera.cpp
+++ b/src/core/core-components/qcamera.cpp
@@ -351,7 +351,7 @@ float QCamera::top() const
return d->m_lens->top();
}
-QMatrix4x4 QCamera::projectionMatrix()
+QMatrix4x4 QCamera::projectionMatrix() const
{
Q_D(const QCamera);
return d->m_lens->projectionMatrix();
diff --git a/src/core/core-components/qcamera.h b/src/core/core-components/qcamera.h
index 6c4913426..edb8598e0 100644
--- a/src/core/core-components/qcamera.h
+++ b/src/core/core-components/qcamera.h
@@ -134,7 +134,7 @@ public:
void setTop(float top);
float top() const;
- QMatrix4x4 projectionMatrix();
+ QMatrix4x4 projectionMatrix() const;
void setPosition(const QVector3D &position);
QVector3D position() const;
diff --git a/src/core/nodes/qnode.h b/src/core/nodes/qnode.h
index 775322363..e61f30edb 100644
--- a/src/core/nodes/qnode.h
+++ b/src/core/nodes/qnode.h
@@ -57,9 +57,9 @@ typedef QSharedPointer<QNode> QNodePtr;
#define QT3D_CLONEABLE(Class) \
QNode *doClone() const Q_DECL_OVERRIDE { \
- Class *clone = new Class; \
- clone->copy(this); \
- return clone; \
+ Class *clone_ = new Class; \
+ clone_->copy(this); \
+ return clone_; \
}
class QT3DCORESHARED_EXPORT QNode : public QObject
diff --git a/src/core/nodes/qnode_p.h b/src/core/nodes/qnode_p.h
index b0b05037b..67f999f3e 100644
--- a/src/core/nodes/qnode_p.h
+++ b/src/core/nodes/qnode_p.h
@@ -62,7 +62,7 @@ public:
void setArbiter(QLockableObserverInterface *arbiter) Q_DECL_OVERRIDE;
void notifyPropertyChange(const char *name, const QVariant &value);
- virtual void notifyObservers(const QSceneChangePtr &change);
+ void notifyObservers(const QSceneChangePtr &change) Q_DECL_OVERRIDE;
void insertTree(QNode *treeRoot, int depth = 0);
diff --git a/src/core/services/qservicelocator.h b/src/core/services/qservicelocator.h
index 321ada9bf..ab8ddb413 100644
--- a/src/core/services/qservicelocator.h
+++ b/src/core/services/qservicelocator.h
@@ -91,8 +91,8 @@ public:
template<class T>
T *service(int serviceType)
{
- QAbstractServiceProvider *service = _q_getServiceHelper(serviceType);
- return static_cast<T *>(service);
+ QAbstractServiceProvider *service_ = _q_getServiceHelper(serviceType);
+ return static_cast<T *>(service_);
}
// Convenience accessors for Qt3D provided services
diff --git a/src/input/q3dkeyevent.h b/src/input/q3dkeyevent.h
index d84519f7e..21f3e4b3c 100644
--- a/src/input/q3dkeyevent.h
+++ b/src/input/q3dkeyevent.h
@@ -71,10 +71,10 @@ public:
inline bool isAutoRepeat() const { return m_event.isAutoRepeat(); }
inline int count() const { return m_event.count(); }
inline quint32 nativeScanCode() const { return m_event.nativeScanCode(); }
- inline bool isAccepted() { return m_event.isAccepted(); }
+ inline bool isAccepted() const { return m_event.isAccepted(); }
inline void setAccepted(bool accepted) { m_event.setAccepted(accepted); }
inline QEvent::Type type() const { return m_event.type(); }
- Q_INVOKABLE bool matches(QKeySequence::StandardKey key) const { return m_event.matches(key); }
+ Q_INVOKABLE bool matches(QKeySequence::StandardKey key_) const { return m_event.matches(key_); }
private:
QKeyEvent m_event;
diff --git a/src/render/backend/quniformvalue_p.h b/src/render/backend/quniformvalue_p.h
index b3f4a64b9..e3c983a83 100644
--- a/src/render/backend/quniformvalue_p.h
+++ b/src/render/backend/quniformvalue_p.h
@@ -118,7 +118,7 @@ public :
// Called by the QGraphicContext prior applying
void setTextureUnit(int textureUnit) { m_textureUnit = textureUnit; }
- void apply(QGraphicsContext *ctx, const ShaderUniform &description) const;
+ void apply(QGraphicsContext *ctx, const ShaderUniform &description) const Q_DECL_OVERRIDE;
private:
QNodeId m_textureId;
diff --git a/src/render/backend/renderannotation_p.h b/src/render/backend/renderannotation_p.h
index e737328ab..70f6641ce 100644
--- a/src/render/backend/renderannotation_p.h
+++ b/src/render/backend/renderannotation_p.h
@@ -60,7 +60,7 @@ public:
QVariant criterionValue() const;
QString criterionName() const;
- void sceneChangeEvent(const QSceneChangePtr &e);
+ void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE;
bool operator ==(const RenderAnnotation &other);
bool operator !=(const RenderAnnotation &other);
diff --git a/src/render/backend/rendereffect_p.h b/src/render/backend/rendereffect_p.h
index 55a4f9fde..40291c275 100644
--- a/src/render/backend/rendereffect_p.h
+++ b/src/render/backend/rendereffect_p.h
@@ -60,7 +60,7 @@ public:
void cleanup();
void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE;
- void sceneChangeEvent(const QSceneChangePtr &e);
+ void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE;
void appendRenderTechnique(const QNodeId &t);
QList<QNodeId> techniques() const;
diff --git a/src/render/backend/rendershader_p.h b/src/render/backend/rendershader_p.h
index 3b1955626..bece7be93 100644
--- a/src/render/backend/rendershader_p.h
+++ b/src/render/backend/rendershader_p.h
@@ -65,7 +65,7 @@ public:
void cleanup();
- void updateFromPeer(QNode *peer);
+ void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE;
void updateUniforms(QGraphicsContext *ctx, const QUniformPack &pack);
void setFragOutputs(const QHash<QString, int> &fragOutputs);
diff --git a/src/render/backend/rendertechnique_p.h b/src/render/backend/rendertechnique_p.h
index 2c65192c3..6427c6176 100644
--- a/src/render/backend/rendertechnique_p.h
+++ b/src/render/backend/rendertechnique_p.h
@@ -67,7 +67,7 @@ public:
void updateFromPeer(QNode *peer) Q_DECL_OVERRIDE;
- void sceneChangeEvent(const QSceneChangePtr &e);
+ void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE;
QList<QNodeId> parameters() const;
void appendRenderPass(const QNodeId &renderPassId);
diff --git a/src/render/frontend/qabstractsceneloader.h b/src/render/frontend/qabstractsceneloader.h
index d5e08aa35..942e23744 100644
--- a/src/render/frontend/qabstractsceneloader.h
+++ b/src/render/frontend/qabstractsceneloader.h
@@ -71,8 +71,6 @@ public:
Status status() const;
void setStatus(Status status);
- virtual void sceneChangeEvent(const QSceneChangePtr &change) = 0;
-
Q_SIGNALS:
void sourceChanged();
void statusChanged();
diff --git a/src/render/frontend/qcylindermesh.cpp b/src/render/frontend/qcylindermesh.cpp
index 7c5193f59..5c93a8234 100644
--- a/src/render/frontend/qcylindermesh.cpp
+++ b/src/render/frontend/qcylindermesh.cpp
@@ -56,7 +56,7 @@ class CylinderMeshFunctor : public QAbstractMeshFunctor
public:
CylinderMeshFunctor(int rings, int slices, float radius, float length);
QMeshDataPtr operator ()() Q_DECL_OVERRIDE;
- bool operator ==(const QAbstractMeshFunctor &other) const;
+ bool operator ==(const QAbstractMeshFunctor &other) const Q_DECL_OVERRIDE;
private:
int m_rings;
diff --git a/src/render/frontend/qspheremesh.cpp b/src/render/frontend/qspheremesh.cpp
index a26840bd3..0ede65d43 100644
--- a/src/render/frontend/qspheremesh.cpp
+++ b/src/render/frontend/qspheremesh.cpp
@@ -241,7 +241,7 @@ QMeshDataPtr createSphereMesh(double radius, int rings, int slices, bool hasTang
offset += sizeof(float) * 4;
}
- int faces = (slices * 2) * (rings - 1); // two tris per slice, for all middle rings
+ int faces = (slices * 2) * (rings - 2); // two tris per slice, for all middle rings
faces += 2 * slices; // tri per slice for both top and bottom
QByteArray indexBytes;
diff --git a/sync.profile b/sync.profile
index fdf429afd..4d9163f2b 100644
--- a/sync.profile
+++ b/sync.profile
@@ -20,8 +20,8 @@ $publicclassregexp = "Qt3D::.+";
# - any git symbolic ref resolvable from the module's repository (e.g. "refs/heads/master" to track master branch)
#
%dependencies = (
- "qtbase" => "refs/heads/dev",
- "qtxmlpatterns" => "refs/heads/dev",
- "qtdeclarative" => "refs/heads/dev",
- "qtimageformats" => "refs/heads/dev",
+ "qtbase" => "",
+ "qtxmlpatterns" => "",
+ "qtdeclarative" => "",
+ "qtimageformats" => "",
);
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-14 04:48:32 +0000