diff options
| author | Mirko Damiani <mirko@develer.com> | 2010-05-06 14:50:22 (GMT) |
|---|---|---|
| committer | Benjamin Poulain <benjamin.poulain@nokia.com> | 2010-05-06 14:55:56 (GMT) |
| commit | dbc2cfffd2e71ce4244e8e700b4928a8ab5d5a04 (patch) | |
| tree | c03af5b00c19c9db9503337ac963f94f159213c3 | |
| parent | c06c9ecf3f37ca8ff8a4be14c9f4e1c2e483250a (diff) | |
| download | Qt-dbc2cfffd2e71ce4244e8e700b4928a8ab5d5a04.zip Qt-dbc2cfffd2e71ce4244e8e700b4928a8ab5d5a04.tar.gz Qt-dbc2cfffd2e71ce4244e8e700b4928a8ab5d5a04.tar.bz2 | |
Don't initialize Wintab if QT_NO_TABLETEVENT is defined.
Functions qt_tablet_init() and qt_tablet_init_wce() are now wrapped with
QT_NO_TABLETEVENT macro.
Merge-request: 2383
Reviewed-by: Benjamin Poulain <benjamin.poulain@nokia.com>
| -rw-r--r-- | src/gui/kernel/qwidget_win.cpp | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qwidget_wince.cpp | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/kernel/qwidget_win.cpp b/src/gui/kernel/qwidget_win.cpp index 7d647b7..4912291 100644 --- a/src/gui/kernel/qwidget_win.cpp +++ b/src/gui/kernel/qwidget_win.cpp @@ -512,8 +512,10 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO DestroyWindow(destroyw); } +#ifndef QT_NO_TABLETEVENT if (q != qt_tablet_widget && QWidgetPrivate::mapper) qt_tablet_init(); +#endif // QT_NO_TABLETEVENT if (q->testAttribute(Qt::WA_DropSiteRegistered)) registerDropSite(true); diff --git a/src/gui/kernel/qwidget_wince.cpp b/src/gui/kernel/qwidget_wince.cpp index 509847b..e352f5c 100644 --- a/src/gui/kernel/qwidget_wince.cpp +++ b/src/gui/kernel/qwidget_wince.cpp @@ -358,8 +358,10 @@ void QWidgetPrivate::create_sys(WId window, bool initializeWindow, bool destroyO DestroyWindow(destroyw); } +#ifndef QT_NO_TABLETEVENT if (q != qt_tablet_widget && QWidgetPrivate::mapper) qt_tablet_init_wce(); +#endif // QT_NO_TABLETEVENT if (q->testAttribute(Qt::WA_DropSiteRegistered)) registerDropSite(true); |