--- a/src/gui/kernel/qwidget_wince.cpp	Wed Jun 23 19:07:03 2010 +0300
+++ b/src/gui/kernel/qwidget_wince.cpp	Tue Jul 06 15:10:48 2010 +0300
@@ -46,7 +46,7 @@
 QT_BEGIN_NAMESPACE
 
 const QString qt_reg_winclass(QWidget *w);                // defined in qapplication_win.cpp
-extern "C" LRESULT CALLBACK QtWndProc(HWND, UINT, WPARAM, LPARAM);
+extern "C" LRESULT QT_WIN_CALLBACK QtWndProc(HWND, UINT, WPARAM, LPARAM);
 
 //#define TABLET_DEBUG
 #define PACKETDATA  (PK_X | PK_Y | PK_BUTTONS | PK_NORMAL_PRESSURE | PK_TANGENT_PRESSURE \
@@ -63,6 +63,7 @@
 typedef int     (API *PtrWTQueueSizeGet)(HCTX);
 typedef BOOL    (API *PtrWTQueueSizeSet)(HCTX, int);
 
+#ifndef QT_NO_TABLETEVENT
 static void qt_tablet_init_wce();
 static void qt_tablet_cleanup_wce();
 
@@ -135,6 +136,7 @@
     delete qt_tablet_widget;
     qt_tablet_widget = 0;
 }
+#endif // QT_NO_TABLETEVENT
 
 
 // The internal qWinRequestConfig, defined in qapplication_win.cpp, stores move,
@@ -358,8 +360,10 @@
         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);
@@ -586,7 +590,7 @@
 }
 
 // The procedure does nothing, but is required for mousegrabbing to work
-LRESULT CALLBACK qJournalRecordProc(int nCode, WPARAM wParam, LPARAM lParam) {
+LRESULT QT_WIN_CALLBACK qJournalRecordProc(int nCode, WPARAM wParam, LPARAM lParam) {
     Q_UNUSED(nCode);
     Q_UNUSED(wParam);
     Q_UNUSED(lParam);