summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@digia.com>2013-03-11 19:19:32 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-03-14 19:49:38 +0100
commitb6e9a8f21ac8b4cc3cc56232ce346ebd7ba17a70 (patch)
treea09b433fbed7989b4cc75e51f704375b4992ee64
parent7015b464c0aa5c69ce204fc8d81438ee949a2e71 (diff)
Add a generic Qt::Edge enum
The values are Top/Left/Right/BottomEdge and values specified so that it can be extended as flags later. Change-Id: I67482265e14d89942a8f59bf09e9e3fadab8243f Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com> Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com> Reviewed-by: Jerome Pasion <jerome.pasion@digia.com> Reviewed-by: Lars Knoll <lars.knoll@digia.com> Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
-rw-r--r--src/corelib/global/qnamespace.h9
-rw-r--r--src/corelib/global/qnamespace.qdoc11
2 files changed, 19 insertions, 1 deletions
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h
index a33c50a041..0ae0fdf57c 100644
--- a/src/corelib/global/qnamespace.h
+++ b/src/corelib/global/qnamespace.h
@@ -63,7 +63,7 @@ Qt {
Q_ENUMS(ScrollBarPolicy FocusPolicy ContextMenuPolicy)
Q_ENUMS(ArrowType ToolButtonStyle PenStyle PenCapStyle PenJoinStyle BrushStyle)
Q_ENUMS(FillRule MaskMode BGMode ClipOperation SizeMode)
- Q_ENUMS(Axis Corner LayoutDirection SizeHint Orientation DropAction)
+ Q_ENUMS(Axis Corner Edge LayoutDirection SizeHint Orientation DropAction)
Q_FLAGS(Alignment Orientations DropActions)
Q_FLAGS(DockWidgetAreas ToolBarAreas)
Q_ENUMS(DockWidgetArea ToolBarArea)
@@ -1202,6 +1202,13 @@ public:
BottomRightCorner = 0x00003
};
+ enum Edge {
+ TopEdge = 0x00001,
+ LeftEdge = 0x00002,
+ RightEdge = 0x00004,
+ BottomEdge = 0x00008
+ };
+
enum ConnectionType {
AutoConnection,
DirectConnection,
diff --git a/src/corelib/global/qnamespace.qdoc b/src/corelib/global/qnamespace.qdoc
index 02d00c213b..b065507645 100644
--- a/src/corelib/global/qnamespace.qdoc
+++ b/src/corelib/global/qnamespace.qdoc
@@ -1710,6 +1710,17 @@
*/
/*!
+ \enum Qt::Edge
+
+ This enum type specifies an edge in a rectangle:
+
+ \value TopEdge The top edge of the rectangle.
+ \value LeftEdge The left edge of the rectangle.
+ \value RightEdge The right edge of the rectangle.
+ \value BottomEdge The bottom edge of the rectangle.
+*/
+
+/*!
\enum Qt::ScrollBarPolicy
This enum type describes the various modes of QAbstractScrollArea's scroll