diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-08 13:22:58 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-02-08 13:22:58 (GMT) |
| commit | f7ad03a30b69143a6670424a756d65860c428430 (patch) | |
| tree | 618d6875bd4b307078202c7f859febd285a5020b /src/gui/kernel/qapplication_p.h | |
| parent | d43d9c0d273911f2222f9d79b8e028458cb7abeb (diff) | |
| parent | 3abc322eb6834aa61cc77d73dbd17c4389accb00 (diff) | |
| download | Qt-f7ad03a30b69143a6670424a756d65860c428430.zip Qt-f7ad03a30b69143a6670424a756d65860c428430.tar.gz Qt-f7ad03a30b69143a6670424a756d65860c428430.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Revised fix for system tray popup activation
Fixed draggabletext example.
Added new mouse cursor types.
Doc: more \since 4.7
Doc: add \since 4.7 to new functions.
Diffstat (limited to 'src/gui/kernel/qapplication_p.h')
| -rw-r--r-- | src/gui/kernel/qapplication_p.h | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/gui/kernel/qapplication_p.h b/src/gui/kernel/qapplication_p.h index 59565d4..0764553 100644 --- a/src/gui/kernel/qapplication_p.h +++ b/src/gui/kernel/qapplication_p.h @@ -518,6 +518,17 @@ public: QGestureManager *gestureManager; QWidget *gestureWidget; +#if defined(Q_WS_X11) || defined(Q_WS_WIN) + QPixmap *move_cursor; + QPixmap *copy_cursor; + QPixmap *link_cursor; +#endif +#if defined(Q_WS_WIN) + QPixmap *ignore_cursor; +#endif +#if defined(Q_WS_X11) || defined(Q_WS_WIN) + QPixmap getPixmapCursor(Qt::CursorShape cshape); +#endif QMap<int, QWeakPointer<QWidget> > widgetForTouchPointId; QMap<int, QTouchEvent::TouchPoint> appCurrentTouchPoints; |