diff options
author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-06-19 11:09:49 (GMT) |
---|---|---|
committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-06-19 11:09:49 (GMT) |
commit | 46467bcaab29c40a4a3465232b5368d8cda75502 (patch) | |
tree | f2c89352aca71e2dbe04b3f5c8566235ec5d64d2 /src | |
parent | bdd406e6ad96cfb7d31897e1bb2e551cf69036eb (diff) | |
download | Qt-46467bcaab29c40a4a3465232b5368d8cda75502.zip Qt-46467bcaab29c40a4a3465232b5368d8cda75502.tar.gz Qt-46467bcaab29c40a4a3465232b5368d8cda75502.tar.bz2 |
Compile on Windows again
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(); |