diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-08-21 08:57:24 (GMT) |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-08-21 08:57:24 (GMT) |
| commit | 49c5acd406f5d2607b7a66d38d6279aa8c78f7f9 (patch) | |
| tree | f45126f94631d128a05817e8179ebbaaa607df60 /src/corelib/global | |
| parent | a44894a39113e0eb9d4f7c912eee4671b3f391c1 (diff) | |
| parent | 8280ed177d798aeaf82868ba6c7c8c4250051f1d (diff) | |
| download | Qt-49c5acd406f5d2607b7a66d38d6279aa8c78f7f9.zip Qt-49c5acd406f5d2607b7a66d38d6279aa8c78f7f9.tar.gz Qt-49c5acd406f5d2607b7a66d38d6279aa8c78f7f9.tar.bz2 | |
Merge commit 'qt/master'
Conflicts:
examples/graphicsview/graphicsview.pro
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qnamespace.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index f86ffd3..e93e477 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -1445,6 +1445,17 @@ public: RightToLeft }; + enum AnchorPoint { + AnchorLeft = 0, + AnchorHorizontalCenter, + AnchorRight, + AnchorTop, + AnchorVerticalCenter, + AnchorBottom + }; + + + enum DropAction { CopyAction = 0x1, MoveAction = 0x2, |