diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-06-19 11:16:19 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-06-19 11:16:19 (GMT) |
| commit | dd11e3148993ed389c97d679c31603be83bd3dc0 (patch) | |
| tree | 07688b014c3409c0db2be11a7f6291fd67479f11 /src | |
| parent | 1f731da727b5e5bc1e675cf3a009d593b5e7d7c1 (diff) | |
| parent | 46467bcaab29c40a4a3465232b5368d8cda75502 (diff) | |
| download | Qt-dd11e3148993ed389c97d679c31603be83bd3dc0.zip Qt-dd11e3148993ed389c97d679c31603be83bd3dc0.tar.gz Qt-dd11e3148993ed389c97d679c31603be83bd3dc0.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt-multitouch
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/kernel/qwidget_p.h | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/gui/kernel/qwidget_p.h b/src/gui/kernel/qwidget_p.h index d597a50..cc31687 100644 --- a/src/gui/kernel/qwidget_p.h +++ b/src/gui/kernel/qwidget_p.h @@ -541,10 +541,6 @@ public: uint usesDoubleBufferedGLContext : 1; // *************************** Platform specific ************************************ -#if defined(Q_WS_X11) || defined(Q_WS_MAC) - void registerTouchWindow(); -#endif - #if defined(Q_WS_X11) // <----------------------------------------------------------- X11 QX11Info xinfo; Qt::HANDLE picture; @@ -567,6 +563,7 @@ public: void unregisterOleDnd(QWidget *widget, QOleDropTarget *target); #endif void grabMouseWhileInWindow(); + void registerTouchWindow(); #elif defined(Q_WS_MAC) // <--------------------------------------------------------- MAC // This is new stuff uint needWindowChange : 1; @@ -632,6 +629,7 @@ public: static OSStatus qt_window_event(EventHandlerCallRef er, EventRef event, void *); static OSStatus qt_widget_event(EventHandlerCallRef er, EventRef event, void *); static bool qt_widget_rgn(QWidget *, short, RgnHandle, bool); + void registerTouchWindow(); #elif defined(Q_WS_QWS) // <--------------------------------------------------------- QWS void setMaxWindowState_helper(); void setFullScreenSize_helper(); |