diff -r b72c6db6890b -r 5dc02b23752f src/activeqt/control/qaxserverbase.cpp
--- a/src/activeqt/control/qaxserverbase.cpp	Wed Jun 23 19:07:03 2010 +0300
+++ b/src/activeqt/control/qaxserverbase.cpp	Tue Jul 06 15:10:48 2010 +0300
@@ -160,7 +160,7 @@
     void createMenu(QMenuBar *menuBar);
     void removeMenu();
 
-    static LRESULT CALLBACK ActiveXProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
+    static LRESULT QT_WIN_CALLBACK ActiveXProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam);
 
 // Object registration with OLE
     void registerActiveObject(IUnknown *object);
@@ -764,7 +764,7 @@
 };
 
 // callback for DLL server to hook into non-Qt eventloop
-LRESULT CALLBACK axs_FilterProc(int nCode, WPARAM wParam, LPARAM lParam)
+LRESULT QT_WIN_CALLBACK axs_FilterProc(int nCode, WPARAM wParam, LPARAM lParam)
 {
     if (qApp && !invokeCount)
         qApp->sendPostedEvents();
@@ -1350,7 +1350,7 @@
 
     The semantics of \a wParam and \a lParam depend on the value of \a uMsg.
 */
-LRESULT CALLBACK QAxServerBase::ActiveXProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
+LRESULT QT_WIN_CALLBACK QAxServerBase::ActiveXProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam)
 {
     if (uMsg == WM_CREATE) {
         CREATESTRUCT *cs = (CREATESTRUCT*)lParam;
@@ -1536,7 +1536,7 @@
     HINSTANCE hInst = (HINSTANCE)qAxInstance;
     EnterCriticalSection(&createWindowSection);
     QString cn(QLatin1String("QAxControl"));
-    cn += QString::number((int)ActiveXProc);
+    cn += QString::number((quintptr)ActiveXProc);
     if (!atom) {
         WNDCLASS wcTemp;
         wcTemp.style = CS_DBLCLKS;
@@ -1599,10 +1599,10 @@
 	ushort itemId;
         if (flags & MF_POPUP) {
             itemId = static_cast<ushort>(
-                reinterpret_cast<ulong>(createPopup(action->menu()))
+                reinterpret_cast<quintptr>(createPopup(action->menu()))
             );
         } else {
-            itemId = static_cast<ushort>(reinterpret_cast<ulong>(action));
+            itemId = static_cast<ushort>(reinterpret_cast<quintptr>(action));
             actionMap.remove(itemId);
             actionMap.insert(itemId, action);
         }
@@ -1646,10 +1646,10 @@
 	ushort itemId;
         if (flags & MF_POPUP) {
             itemId = static_cast<ushort>(
-                reinterpret_cast<ulong>(createPopup(action->menu()))
+                reinterpret_cast<quintptr>(createPopup(action->menu()))
             );
         } else {
-            itemId = static_cast<ushort>(reinterpret_cast<ulong>(action));
+            itemId = static_cast<ushort>(reinterpret_cast<quintptr>(action));
             actionMap.insert(itemId, action);
         }
         AppendMenu(hmenuShared, flags, itemId, (const wchar_t *)action->text().utf16());