diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2010-05-20 14:36:25 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2010-05-20 14:36:25 (GMT) |
| commit | e4dc3567af533df2e57425952c4609726515d2cd (patch) | |
| tree | 72824b5efc9a4d6ed9f099d34404076245e164fa /src/declarative/graphicsitems/qdeclarativeflickable_p_p.h | |
| parent | a36e8ca7afd0c15e5ec73bf4ea21464ab89a3662 (diff) | |
| parent | dbfedcb31961579499fcb5342ccc42311191bcd4 (diff) | |
| download | Qt-e4dc3567af533df2e57425952c4609726515d2cd.zip Qt-e4dc3567af533df2e57425952c4609726515d2cd.tar.gz Qt-e4dc3567af533df2e57425952c4609726515d2cd.tar.bz2 | |
Merge remote branch 'origin/master'
Conflicts:
src/gui/dialogs/qnspanelproxy_mac.mm
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativeflickable_p_p.h')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativeflickable_p_p.h | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativeflickable_p_p.h b/src/declarative/graphicsitems/qdeclarativeflickable_p_p.h index 01cfb18..b467ed2 100644 --- a/src/declarative/graphicsitems/qdeclarativeflickable_p_p.h +++ b/src/declarative/graphicsitems/qdeclarativeflickable_p_p.h @@ -131,8 +131,12 @@ public: AxisData vData; QDeclarativeTimeLine timeline; - bool flicked : 1; - bool moving : 1; + bool flickingHorizontally : 1; + bool flickingVertically : 1; + bool hMoved : 1; + bool vMoved : 1; + bool movingHorizontally : 1; + bool movingVertically : 1; bool stealMouse : 1; bool pressed : 1; bool interactive : 1; @@ -158,7 +162,7 @@ public: int vTime; QDeclarativeTimeLine velocityTimeline; QDeclarativeFlickableVisibleArea *visibleArea; - QDeclarativeFlickable::FlickDirection flickDirection; + QDeclarativeFlickable::FlickableDirection flickableDirection; QDeclarativeFlickable::BoundsBehavior boundsBehavior; void handleMousePressEvent(QGraphicsSceneMouseEvent *); |