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/qapplication_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/qapplication_p.h')
| -rw-r--r-- | src/gui/kernel/qapplication_p.h | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/src/gui/kernel/qapplication_p.h b/src/gui/kernel/qapplication_p.h index c33eb1a..707caaa 100644 --- a/src/gui/kernel/qapplication_p.h +++ b/src/gui/kernel/qapplication_p.h @@ -71,6 +71,9 @@ #include "QtGui/qscreen_qws.h" #include <private/qgraphicssystem_qws_p.h> #endif +#ifdef Q_OS_SYMBIAN +#include <w32std.h> +#endif QT_BEGIN_NAMESPACE @@ -492,8 +495,8 @@ public: static int app_compile_version; #ifdef QT_KEYPAD_NAVIGATION - static bool keypadNavigation; static QWidget *oldEditFocus; + static Qt::NavigationMode navigationMode; #endif #if defined(Q_WS_MAC) || defined(Q_WS_X11) @@ -511,7 +514,9 @@ public: QWidget *native, QWidget **buttonDown, QPointer<QWidget> &lastMouseReceiver, bool spontaneous = true); #ifdef Q_OS_SYMBIAN + static void setNavigationMode(Qt::NavigationMode mode); static TUint resolveS60ScanCode(TInt scanCode, TUint keysym); + QSet<WId> nativeWindows; #endif #if defined(Q_WS_WIN) || defined(Q_WS_X11) || defined (Q_WS_QWS) void sendSyntheticEnterLeave(QWidget *widget); @@ -595,6 +600,15 @@ Q_GUI_EXPORT void qt_translateRawTouchEvent(QWidget *window, QTouchEvent::DeviceType deviceType, const QList<QTouchEvent::TouchPoint> &touchPoints); +#if defined(Q_WS_WIN) + extern void qt_win_set_cursor(QWidget *, bool); +#elif defined(Q_WS_X11) + extern void qt_x11_enforce_cursor(QWidget *, bool); + extern void qt_x11_enforce_cursor(QWidget *); +#elif defined(Q_OS_SYMBIAN) + extern void qt_symbian_set_cursor(QWidget *, bool); +#endif + QT_END_NAMESPACE #endif // QAPPLICATION_P_H |