diff options
author | J-P Nurmi <jpnurmi@digia.com> | 2014-01-17 14:57:24 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-22 18:20:33 +0100 |
commit | cf66bf942bfd19c6c01d05a77b84d4a36cb7ca9f (patch) | |
tree | fdc36c46136dee27acaade7b3f348543d3d353e9 | |
parent | 6111cc55cabc25e4a56e19682bbb481ef5886ca8 (diff) |
Declare flags for Qt::Edge
Task-number: QTBUG-36174
Change-Id: I11424b79b6762764095cbb3b25527373e2b6fd1b
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
-rw-r--r-- | src/corelib/global/qnamespace.h | 5 |
1 files changed, 4 insertions, 1 deletions
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) |