summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorKai Koehne <kai.koehne@qt.io>2019-03-06 12:36:12 +0100
committerKai Koehne <kai.koehne@qt.io>2019-03-07 08:03:50 +0000
commit534857bed15359797a1edf53fb5bdc33cf4e0897 (patch)
tree7771e9707ad05c97039271d8804f1ad03a052ef4 /src
parent9c0dc42939b2a047709e80d40b18cecf01d4c881 (diff)
QML: Properly revision new signals and slots in 5.13
All new signals, slots, ... available in QML should be revisioned. Change-Id: Ib91c65b2bcd64f93d8f536c6cb534390b8689d05 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src')
-rw-r--r--src/render/frontend/qcomputecommand.h6
-rw-r--r--src/render/geometry/qgeometry.h4
-rw-r--r--src/render/materialsystem/qshaderprogrambuilder.h12
-rw-r--r--src/render/picking/qobjectpicker.h4
-rw-r--r--src/render/texture/qabstracttexture.h4
5 files changed, 15 insertions, 15 deletions
diff --git a/src/render/frontend/qcomputecommand.h b/src/render/frontend/qcomputecommand.h
index ad7f89a4d..f0c251a9b 100644
--- a/src/render/frontend/qcomputecommand.h
+++ b/src/render/frontend/qcomputecommand.h
@@ -76,10 +76,10 @@ public Q_SLOTS:
void setWorkGroupX(int workGroupX);
void setWorkGroupY(int workGroupY);
void setWorkGroupZ(int workGroupZ);
- void setRunType(RunType runType);
+ Q_REVISION(13) void setRunType(RunType runType);
- void trigger(int frameCount = 1);
- void trigger(int workGroupX, int workGroupY, int workGroupZ, int frameCount = 1);
+ Q_REVISION(13) void trigger(int frameCount = 1);
+ Q_REVISION(13) void trigger(int workGroupX, int workGroupY, int workGroupZ, int frameCount = 1);
Q_SIGNALS:
void workGroupXChanged();
diff --git a/src/render/geometry/qgeometry.h b/src/render/geometry/qgeometry.h
index 61508c7d2..6f9f5511f 100644
--- a/src/render/geometry/qgeometry.h
+++ b/src/render/geometry/qgeometry.h
@@ -73,8 +73,8 @@ public Q_SLOTS:
Q_SIGNALS:
void boundingVolumePositionAttributeChanged(QAttribute *boundingVolumePositionAttribute);
- void minExtentChanged(const QVector3D &minExtent);
- void maxExtentChanged(const QVector3D &maxExtent);
+ Q_REVISION(13) void minExtentChanged(const QVector3D &minExtent);
+ Q_REVISION(13) void maxExtentChanged(const QVector3D &maxExtent);
protected:
explicit QGeometry(QGeometryPrivate &dd, Qt3DCore::QNode *parent = nullptr);
void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) override;
diff --git a/src/render/materialsystem/qshaderprogrambuilder.h b/src/render/materialsystem/qshaderprogrambuilder.h
index 532aa7d73..33966b708 100644
--- a/src/render/materialsystem/qshaderprogrambuilder.h
+++ b/src/render/materialsystem/qshaderprogrambuilder.h
@@ -108,12 +108,12 @@ Q_SIGNALS:
void geometryShaderGraphChanged(const QUrl &geometryShaderGraph);
void fragmentShaderGraphChanged(const QUrl &fragmentShaderGraph);
void computeShaderGraphChanged(const QUrl &computeShaderGraph);
- void vertexShaderCodeChanged(const QByteArray &vertexShaderCode);
- void tessellationControlShaderCodeChanged(const QByteArray &tessellationControlShaderCode);
- void tessellationEvaluationShaderCodeChanged(const QByteArray &tessellationEvaluationShaderCode);
- void geometryShaderCodeChanged(const QByteArray &geometryShaderCode);
- void fragmentShaderCodeChanged(const QByteArray &fragmentShaderCode);
- void computeShaderCodeChanged(const QByteArray &computeShaderCode);
+ Q_REVISION(13) void vertexShaderCodeChanged(const QByteArray &vertexShaderCode);
+ Q_REVISION(13) void tessellationControlShaderCodeChanged(const QByteArray &tessellationControlShaderCode);
+ Q_REVISION(13) void tessellationEvaluationShaderCodeChanged(const QByteArray &tessellationEvaluationShaderCode);
+ Q_REVISION(13) void geometryShaderCodeChanged(const QByteArray &geometryShaderCode);
+ Q_REVISION(13) void fragmentShaderCodeChanged(const QByteArray &fragmentShaderCode);
+ Q_REVISION(13) void computeShaderCodeChanged(const QByteArray &computeShaderCode);
protected:
explicit QShaderProgramBuilder(QShaderProgramBuilderPrivate &dd, Qt3DCore::QNode *parent = nullptr);
diff --git a/src/render/picking/qobjectpicker.h b/src/render/picking/qobjectpicker.h
index 1d15f6092..616f23873 100644
--- a/src/render/picking/qobjectpicker.h
+++ b/src/render/picking/qobjectpicker.h
@@ -75,7 +75,7 @@ public:
public Q_SLOTS:
void setHoverEnabled(bool hoverEnabled);
void setDragEnabled(bool dragEnabled);
- void setPriority(int priority);
+ Q_REVISION(13) void setPriority(int priority);
Q_SIGNALS:
void pressed(Qt3DRender::QPickEvent *pick);
@@ -88,7 +88,7 @@ Q_SIGNALS:
void dragEnabledChanged(bool dragEnabled);
void pressedChanged(bool pressed);
void containsMouseChanged(bool containsMouse);
- void priorityChanged(int priority);
+ Q_REVISION(13) void priorityChanged(int priority);
protected:
void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change) override;
diff --git a/src/render/texture/qabstracttexture.h b/src/render/texture/qabstracttexture.h
index e6833ffb4..40953f253 100644
--- a/src/render/texture/qabstracttexture.h
+++ b/src/render/texture/qabstracttexture.h
@@ -337,8 +337,8 @@ Q_SIGNALS:
void comparisonModeChanged(ComparisonMode comparisonMode);
void layersChanged(int layers);
void samplesChanged(int samples);
- void handleTypeChanged(HandleType handleType);
- void handleChanged(QVariant handle);
+ Q_REVISION(13) void handleTypeChanged(HandleType handleType);
+ Q_REVISION(13) void handleChanged(QVariant handle);
protected:
explicit QAbstractTexture(Qt3DCore::QNode *parent = nullptr);