diff options
author | Tomi Korpipaa <tomi.korpipaa@qt.io> | 2023-01-19 11:18:14 +0200 |
---|---|---|
committer | Tomi Korpipaa <tomi.korpipaa@qt.io> | 2023-01-19 14:35:14 +0200 |
commit | 5933f55a52bec88d4fe3222418abb1d5b6d1f6d1 (patch) | |
tree | 3a8c6e083c249e9db36f3df4036dd020f7160202 /src/datavisualization/engine | |
parent | 9a8d01104311f1d1670318f622e0ac985fb52a74 (diff) |
Fix invalid drawMode
Q_ENUM is now required for flags to work correctly from QML. Added
the missing definitions.
Pick-to: 6.5
Fixes: QTBUG-110358
Change-Id: Ifde893a33a5b43c26f51b0c97883458462376be6
Reviewed-by: Sami Varanka <sami.varanka@qt.io>
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Diffstat (limited to 'src/datavisualization/engine')
-rw-r--r-- | src/datavisualization/engine/qabstract3dgraph.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/datavisualization/engine/qabstract3dgraph.h b/src/datavisualization/engine/qabstract3dgraph.h index 9346c421..f3d8ecaa 100644 --- a/src/datavisualization/engine/qabstract3dgraph.h +++ b/src/datavisualization/engine/qabstract3dgraph.h @@ -22,8 +22,6 @@ class QAbstract3DSeries; class Q_DATAVISUALIZATION_EXPORT QAbstract3DGraph : public QWindow, protected QOpenGLFunctions { Q_OBJECT - Q_ENUMS(ShadowQuality) - Q_ENUMS(ElementType) Q_FLAGS(SelectionFlag SelectionFlags) Q_FLAGS(OptimizationHint OptimizationHints) Q_PROPERTY(QAbstract3DInputHandler* activeInputHandler READ activeInputHandler WRITE setActiveInputHandler NOTIFY activeInputHandlerChanged) @@ -63,6 +61,7 @@ public: SelectionSlice = 8, SelectionMultiSeries = 16 }; + Q_ENUM(SelectionFlag) Q_DECLARE_FLAGS(SelectionFlags, SelectionFlag) enum ShadowQuality { @@ -74,6 +73,7 @@ public: ShadowQualitySoftMedium, ShadowQualitySoftHigh }; + Q_ENUM(ShadowQuality) enum ElementType { ElementNone = 0, @@ -83,11 +83,13 @@ public: ElementAxisZLabel, ElementCustomItem }; + Q_ENUM(ElementType) enum OptimizationHint { OptimizationDefault = 0, OptimizationStatic = 1 }; + Q_ENUM(OptimizationHint) Q_DECLARE_FLAGS(OptimizationHints, OptimizationHint) public: |