diff options
author | Ulf Hermann <ulf.hermann@qt.io> | 2021-06-02 14:07:41 +0200 |
---|---|---|
committer | Ulf Hermann <ulf.hermann@qt.io> | 2021-06-11 10:24:41 +0200 |
commit | 8691caff2b685aba4b1e83292de6c4d34775ec0b (patch) | |
tree | ea88d7292aeb1463bc9cae1c36f90afe8cb9c14f /src/datavisualization/data/qitemmodelscatterdataproxy.h | |
parent | e0713ad6f89eac8a4e7cbb5adfaf4daf6a91ca3c (diff) |
Modernize and update to latest CMake API
Use declarative registration for QML types, and separate the backing
library from the plugin. Also, bump the revision numbers to account for
Qt6 and drop the "2" from the source directory name.
Change-Id: Ib48f90ad32a3624e7c31f1d2af9fcd92f069ee7f
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Diffstat (limited to 'src/datavisualization/data/qitemmodelscatterdataproxy.h')
-rw-r--r-- | src/datavisualization/data/qitemmodelscatterdataproxy.h | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/datavisualization/data/qitemmodelscatterdataproxy.h b/src/datavisualization/data/qitemmodelscatterdataproxy.h index c0106e81..5d66b12e 100644 --- a/src/datavisualization/data/qitemmodelscatterdataproxy.h +++ b/src/datavisualization/data/qitemmodelscatterdataproxy.h @@ -47,14 +47,14 @@ class QT_DATAVISUALIZATION_EXPORT QItemModelScatterDataProxy : public QScatterDa Q_PROPERTY(QString yPosRole READ yPosRole WRITE setYPosRole NOTIFY yPosRoleChanged) Q_PROPERTY(QString zPosRole READ zPosRole WRITE setZPosRole NOTIFY zPosRoleChanged) Q_PROPERTY(QString rotationRole READ rotationRole WRITE setRotationRole NOTIFY rotationRoleChanged) - Q_PROPERTY(QRegularExpression xPosRolePattern READ xPosRolePattern WRITE setXPosRolePattern NOTIFY xPosRolePatternChanged REVISION 1) - Q_PROPERTY(QRegularExpression yPosRolePattern READ yPosRolePattern WRITE setYPosRolePattern NOTIFY yPosRolePatternChanged REVISION 1) - Q_PROPERTY(QRegularExpression zPosRolePattern READ zPosRolePattern WRITE setZPosRolePattern NOTIFY zPosRolePatternChanged REVISION 1) - Q_PROPERTY(QRegularExpression rotationRolePattern READ rotationRolePattern WRITE setRotationRolePattern NOTIFY rotationRolePatternChanged REVISION 1) - Q_PROPERTY(QString xPosRoleReplace READ xPosRoleReplace WRITE setXPosRoleReplace NOTIFY xPosRoleReplaceChanged REVISION 1) - Q_PROPERTY(QString yPosRoleReplace READ yPosRoleReplace WRITE setYPosRoleReplace NOTIFY yPosRoleReplaceChanged REVISION 1) - Q_PROPERTY(QString zPosRoleReplace READ zPosRoleReplace WRITE setZPosRoleReplace NOTIFY zPosRoleReplaceChanged REVISION 1) - Q_PROPERTY(QString rotationRoleReplace READ rotationRoleReplace WRITE setRotationRoleReplace NOTIFY rotationRoleReplaceChanged REVISION 1) + Q_PROPERTY(QRegularExpression xPosRolePattern READ xPosRolePattern WRITE setXPosRolePattern NOTIFY xPosRolePatternChanged REVISION(1, 1)) + Q_PROPERTY(QRegularExpression yPosRolePattern READ yPosRolePattern WRITE setYPosRolePattern NOTIFY yPosRolePatternChanged REVISION(1, 1)) + Q_PROPERTY(QRegularExpression zPosRolePattern READ zPosRolePattern WRITE setZPosRolePattern NOTIFY zPosRolePatternChanged REVISION(1, 1)) + Q_PROPERTY(QRegularExpression rotationRolePattern READ rotationRolePattern WRITE setRotationRolePattern NOTIFY rotationRolePatternChanged REVISION(1, 1)) + Q_PROPERTY(QString xPosRoleReplace READ xPosRoleReplace WRITE setXPosRoleReplace NOTIFY xPosRoleReplaceChanged REVISION(1, 1)) + Q_PROPERTY(QString yPosRoleReplace READ yPosRoleReplace WRITE setYPosRoleReplace NOTIFY yPosRoleReplaceChanged REVISION(1, 1)) + Q_PROPERTY(QString zPosRoleReplace READ zPosRoleReplace WRITE setZPosRoleReplace NOTIFY zPosRoleReplaceChanged REVISION(1, 1)) + Q_PROPERTY(QString rotationRoleReplace READ rotationRoleReplace WRITE setRotationRoleReplace NOTIFY rotationRoleReplaceChanged REVISION(1, 1)) public: explicit QItemModelScatterDataProxy(QObject *parent = nullptr); @@ -107,14 +107,14 @@ Q_SIGNALS: void yPosRoleChanged(const QString &role); void zPosRoleChanged(const QString &role); void rotationRoleChanged(const QString &role); - Q_REVISION(1) void xPosRolePatternChanged(const QRegularExpression &pattern); - Q_REVISION(1) void yPosRolePatternChanged(const QRegularExpression &pattern); - Q_REVISION(1) void zPosRolePatternChanged(const QRegularExpression &pattern); - Q_REVISION(1) void rotationRolePatternChanged(const QRegularExpression &pattern); - Q_REVISION(1) void rotationRoleReplaceChanged(const QString &replace); - Q_REVISION(1) void xPosRoleReplaceChanged(const QString &replace); - Q_REVISION(1) void yPosRoleReplaceChanged(const QString &replace); - Q_REVISION(1) void zPosRoleReplaceChanged(const QString &replace); + Q_REVISION(1, 1) void xPosRolePatternChanged(const QRegularExpression &pattern); + Q_REVISION(1, 1) void yPosRolePatternChanged(const QRegularExpression &pattern); + Q_REVISION(1, 1) void zPosRolePatternChanged(const QRegularExpression &pattern); + Q_REVISION(1, 1) void rotationRolePatternChanged(const QRegularExpression &pattern); + Q_REVISION(1, 1) void rotationRoleReplaceChanged(const QString &replace); + Q_REVISION(1, 1) void xPosRoleReplaceChanged(const QString &replace); + Q_REVISION(1, 1) void yPosRoleReplaceChanged(const QString &replace); + Q_REVISION(1, 1) void zPosRoleReplaceChanged(const QString &replace); protected: QItemModelScatterDataProxyPrivate *dptr(); |