diff options
| author | axis <qt-info@nokia.com> | 2009-08-21 13:51:34 (GMT) |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-08-21 13:51:34 (GMT) |
| commit | f51a3bf2ed75b68e6746f9154f3e44e48723a7fc (patch) | |
| tree | 6105a10f236a9478404d2a48d7c68fc3fc4da592 /src/corelib/global | |
| parent | afd7cfce7333635edc8d3637f81cc9c3023ee874 (diff) | |
| parent | 4cc604be3fe96169c1dfdc05ff1b1a37e150e265 (diff) | |
| download | Qt-f51a3bf2ed75b68e6746f9154f3e44e48723a7fc.zip Qt-f51a3bf2ed75b68e6746f9154f3e44e48723a7fc.tar.gz Qt-f51a3bf2ed75b68e6746f9154f3e44e48723a7fc.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt into master-s60
Conflicts:
src/gui/graphicsview/qgraphicsitem.cpp
src/gui/kernel/qwidget.cpp
src/gui/kernel/qwidget_p.h
Diffstat (limited to 'src/corelib/global')
| -rw-r--r-- | src/corelib/global/qnamespace.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index e93e477..ab9a3ca 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -1591,6 +1591,11 @@ public: Uninitialized }; + enum CoordinateSystem { + DeviceCoordinates, + LogicalCoordinates + }; + enum TouchPointState { TouchPointPressed = 0x01, TouchPointMoved = 0x02, |