diff options
author | Sarah Smith <sarah.j.smith@nokia.com> | 2009-09-16 01:40:18 (GMT) |
---|---|---|
committer | Sarah Smith <sarah.j.smith@nokia.com> | 2009-09-16 01:40:18 (GMT) |
commit | a7c3ea93e0a1cd56f585a9ce04e6d1b99f4c7a34 (patch) | |
tree | 0ccc262ac7d0d825d1a8c6868307affa444a9e75 /src/gui/kernel/qcursor_p.h | |
parent | 227dd18f0e25ee522e5a4323e849590a314dd4cd (diff) | |
parent | a4571547a38d68d6778bf0ebfa4dc26cc3d865a3 (diff) | |
download | Qt-a7c3ea93e0a1cd56f585a9ce04e6d1b99f4c7a34.zip Qt-a7c3ea93e0a1cd56f585a9ce04e6d1b99f4c7a34.tar.gz Qt-a7c3ea93e0a1cd56f585a9ce04e6d1b99f4c7a34.tar.bz2 |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Diffstat (limited to 'src/gui/kernel/qcursor_p.h')
-rw-r--r-- | src/gui/kernel/qcursor_p.h | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/gui/kernel/qcursor_p.h b/src/gui/kernel/qcursor_p.h index aa4f4b2..12166c8 100644 --- a/src/gui/kernel/qcursor_p.h +++ b/src/gui/kernel/qcursor_p.h @@ -64,6 +64,8 @@ # include "private/qt_x11_p.h" # elif defined(Q_WS_WIN) # include "QtCore/qt_windows.h" +# elif defined(Q_OS_SYMBIAN) +# include "private/qt_s60_p.h" #endif QT_BEGIN_NAMESPACE @@ -74,7 +76,8 @@ class QMacAnimateCursor; #endif class QBitmap; -struct QCursorData { +class QCursorData { +public: QCursorData(Qt::CursorShape s = Qt::ArrowCursor); ~QCursorData(); @@ -111,12 +114,21 @@ struct QCursorData { } curs; void initCursorFromBitmap(); void initCursorFromPixmap(); +#elif defined Q_OS_SYMBIAN + void loadShapeFromResource(RWsSpriteBase& target, QString resource, int hx, int hy, int interval=0); + void constructShapeSprite(RWsSpriteBase& target); + void constructCursorSprite(RWsSpriteBase& target); + RWsPointerCursor pcurs; + RWsSprite scurs; + RPointerArray<TSpriteMember> nativeSpriteMembers; #endif static bool initialized; void update(); static QCursorData *setBitmap(const QBitmap &bitmap, const QBitmap &mask, int hotX, int hotY); }; +extern QCursorData *qt_cursorTable[Qt::LastCursor + 1]; // qcursor.cpp + QT_END_NAMESPACE #endif // QCURSOR_P_H |