From cf66bf942bfd19c6c01d05a77b84d4a36cb7ca9f Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Fri, 17 Jan 2014 14:57:24 +0100 Subject: Declare flags for Qt::Edge Task-number: QTBUG-36174 Change-Id: I11424b79b6762764095cbb3b25527373e2b6fd1b Reviewed-by: Simon Hausmann Reviewed-by: Friedemann Kleint --- src/corelib/global/qnamespace.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'src/corelib/global/qnamespace.h') diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index 97212def92..06a1aa1c91 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -64,7 +64,7 @@ Qt { Q_ENUMS(ArrowType ToolButtonStyle PenStyle PenCapStyle PenJoinStyle BrushStyle) Q_ENUMS(FillRule MaskMode BGMode ClipOperation SizeMode) Q_ENUMS(Axis Corner Edge LayoutDirection SizeHint Orientation DropAction) - Q_FLAGS(Alignment Orientations DropActions) + Q_FLAGS(Alignment Orientations DropActions Edges) Q_FLAGS(DockWidgetAreas ToolBarAreas) Q_ENUMS(DockWidgetArea ToolBarArea) Q_ENUMS(TextFormat) @@ -1240,6 +1240,8 @@ public: BottomEdge = 0x00008 }; + Q_DECLARE_FLAGS(Edges, Edge) + enum ConnectionType { AutoConnection, DirectConnection, @@ -1617,6 +1619,7 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(Qt::Orientations) Q_DECLARE_OPERATORS_FOR_FLAGS(Qt::KeyboardModifiers) Q_DECLARE_OPERATORS_FOR_FLAGS(Qt::WindowFlags) Q_DECLARE_OPERATORS_FOR_FLAGS(Qt::Alignment) +Q_DECLARE_OPERATORS_FOR_FLAGS(Qt::Edges) Q_DECLARE_OPERATORS_FOR_FLAGS(Qt::ImageConversionFlags) Q_DECLARE_OPERATORS_FOR_FLAGS(Qt::DockWidgetAreas) Q_DECLARE_OPERATORS_FOR_FLAGS(Qt::ToolBarAreas) -- cgit v1.2.3