From 5933f55a52bec88d4fe3222418abb1d5b6d1f6d1 Mon Sep 17 00:00:00 2001 From: Tomi Korpipaa Date: Thu, 19 Jan 2023 11:18:14 +0200 Subject: Fix invalid drawMode MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Reviewed-by: Tomi Korpipää --- src/datavisualization/engine/qabstract3dgraph.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/datavisualization/engine') 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: -- cgit v1.2.3