diff options
| author | Alan Alpert <alan.alpert@nokia.com> | 2012-03-01 20:09:52 +1000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-15 22:59:32 +0100 |
| commit | b5b46f398c1a04ab443bf22ec08c5efbf72c161e (patch) | |
| tree | b7e85e2a81a06719ffc28bc5042c98582557209c /src/quick/items/qquickmousearea.cpp | |
| parent | 585bce863f4dd4b169111b2af11e50ba9fece92a (diff) | |
Add a hidden XandYAxis enum value
For Qt 5 XandYAxis is being renamed to XAndYAxis to more consistently
follow capitalization rules. Add an undocumented XandYAxis variable to
ease porting.
Change-Id: Id9e41dd5578373f5f557937da889a9326ff12e53
Reviewed-by: Martin Jones <martin.jones@jollamobile.com>
Diffstat (limited to 'src/quick/items/qquickmousearea.cpp')
| -rw-r--r-- | src/quick/items/qquickmousearea.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/quick/items/qquickmousearea.cpp b/src/quick/items/qquickmousearea.cpp index ad3f4fa215..fd01c80ba5 100644 --- a/src/quick/items/qquickmousearea.cpp +++ b/src/quick/items/qquickmousearea.cpp @@ -64,7 +64,7 @@ static const int PressAndHoldDelay = 800; #ifndef QT_NO_DRAGANDDROP QQuickDrag::QQuickDrag(QObject *parent) -: QObject(parent), _target(0), _axis(XandYAxis), _xmin(-FLT_MAX), +: QObject(parent), _target(0), _axis(XAndYAxis), _xmin(-FLT_MAX), _xmax(FLT_MAX), _ymin(-FLT_MAX), _ymax(FLT_MAX), _active(false), _filterChildren(false) { } @@ -1331,7 +1331,7 @@ void QQuickMouseArea::setCursorShape(Qt::CursorShape shape) \list \li \c drag.target specifies the id of the item to drag. \li \c drag.active specifies if the target item is currently being dragged. - \li \c drag.axis specifies whether dragging can be done horizontally (\c Drag.XAxis), vertically (\c Drag.YAxis), or both (\c Drag.XandYAxis) + \li \c drag.axis specifies whether dragging can be done horizontally (\c Drag.XAxis), vertically (\c Drag.YAxis), or both (\c Drag.XAndYAxis) \li \c drag.minimum and \c drag.maximum limit how far the target can be dragged along the corresponding axes. \endlist |