diff options
| author | Olivier Goffart <ogoffart@woboq.com> | 2018-04-09 23:25:51 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2018-04-10 10:23:16 +0000 |
| commit | da3c5925d546282e99f13b450a674c7024fde9ed (patch) | |
| tree | e9a0888d235b8477343167c0fdabe09e464c8401 /src/datavisualization/engine/drawer_p.h | |
| parent | 1212170af2f4ade8497fb150c3ae0e5d52236e35 (diff) | |
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 <liang.qi@qt.io>
Diffstat (limited to 'src/datavisualization/engine/drawer_p.h')
| -rw-r--r-- | src/datavisualization/engine/drawer_p.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/datavisualization/engine/drawer_p.h b/src/datavisualization/engine/drawer_p.h index 250c4202..8fa1a35f 100644 --- a/src/datavisualization/engine/drawer_p.h +++ b/src/datavisualization/engine/drawer_p.h @@ -48,6 +48,8 @@ QT_BEGIN_NAMESPACE_DATAVISUALIZATION +using QT_PREPEND_NAMESPACE(operator|); // Get the operator|(Qt::AlignmentFlag,Qt::AlignmentFlag) for Qt < 5.12 + class ShaderHelper; class ObjectHelper; class AbstractObjectHelper; @@ -98,7 +100,7 @@ public: QAbstract3DGraph::SelectionFlags mode, ShaderHelper *shader, ObjectHelper *object, const Q3DCamera *camera, bool useDepth = false, bool rotateAlong = false, LabelPosition position = LabelOver, - Qt::AlignmentFlag alignment = Qt::AlignCenter, bool isSlicing = false, + Qt::Alignment alignment = Qt::AlignCenter, bool isSlicing = false, bool isSelecting = false); void generateSelectionLabelTexture(Abstract3DRenderer *item); |