From da3c5925d546282e99f13b450a674c7024fde9ed Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Mon, 9 Apr 2018 23:25:51 +0200 Subject: Use Qt::Alignment instead of the AlignmentFlag enum to represent flags Because from Qt 5.12, the the right operator| is found in the Qt namespace instead of in the global namespace. One must still add the 'using' statement so this patch can be integrated using a previous qtbase. But the statement can be removed once qtbase is updated. Task-number: QTBUG-67582 Change-Id: Ib79c4623e858988bb55a87ad4fb0c1e0ceee81cf Reviewed-by: Liang Qi --- src/datavisualization/engine/drawer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/datavisualization/engine/drawer.cpp') diff --git a/src/datavisualization/engine/drawer.cpp b/src/datavisualization/engine/drawer.cpp index a3f9006c..2e0805e0 100644 --- a/src/datavisualization/engine/drawer.cpp +++ b/src/datavisualization/engine/drawer.cpp @@ -306,7 +306,7 @@ void Drawer::drawLabel(const AbstractRenderItem &item, const LabelItem &labelIte GLfloat itemHeight, QAbstract3DGraph::SelectionFlags mode, ShaderHelper *shader, ObjectHelper *object, const Q3DCamera *camera, bool useDepth, bool rotateAlong, - LabelPosition position, Qt::AlignmentFlag alignment, bool isSlicing, + LabelPosition position, Qt::Alignment alignment, bool isSlicing, bool isSelecting) { // Draw label -- cgit v1.2.3