diff options
| author | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2009-08-21 07:06:09 (GMT) |
|---|---|---|
| committer | Jan-Arve Sæther <jan-arve.saether@nokia.com> | 2009-08-21 07:06:09 (GMT) |
| commit | c7e2ad82ea4cd999e568e2819dea10bf7214eee3 (patch) | |
| tree | 41ec4c2e65dae6284f42f7676ba32fe46594ea8d /src/corelib/global | |
| parent | f11fc8f62558543dac1eca9d52a4801196c55221 (diff) | |
| parent | 926f5ad207fb04fdeb09c0b696dce3c072e47e75 (diff) | |
| download | Qt-c7e2ad82ea4cd999e568e2819dea10bf7214eee3.zip Qt-c7e2ad82ea4cd999e568e2819dea10bf7214eee3.tar.gz Qt-c7e2ad82ea4cd999e568e2819dea10bf7214eee3.tar.bz2 | |
Merge branch 'anchorlayout' of git@gitorious.org:+openbossa-developers/qt/openbossa-clone
Conflicts:
src/gui/graphicsview/graphicsview.pri
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 3c95f2c..a742369 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -1435,6 +1435,17 @@ public: RightToLeft }; + enum AnchorPoint { + AnchorLeft = 0, + AnchorHorizontalCenter, + AnchorRight, + AnchorTop, + AnchorVerticalCenter, + AnchorBottom + }; + + + enum DropAction { CopyAction = 0x1, MoveAction = 0x2, |