diff options
| author | Thierry Bastian <thierry.bastian@nokia.com> | 2010-02-22 13:39:39 (GMT) |
|---|---|---|
| committer | Thierry Bastian <thierry.bastian@nokia.com> | 2010-02-22 14:50:26 (GMT) |
| commit | d033442f92cfee0de952578044bbcb5e858ee835 (patch) | |
| tree | 4a888fc9dd4a136901f816968ac82cb3d57516dd /src/activeqt/control | |
| parent | bbbd8d402ed5c37d43bd419e7b461f9bacad792f (diff) | |
| download | Qt-d033442f92cfee0de952578044bbcb5e858ee835.zip Qt-d033442f92cfee0de952578044bbcb5e858ee835.tar.gz Qt-d033442f92cfee0de952578044bbcb5e858ee835.tar.bz2 | |
Imporve win64 support for mingw
Reviewed-by: ogoffart
Diffstat (limited to 'src/activeqt/control')
| -rw-r--r-- | src/activeqt/control/qaxserverbase.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/activeqt/control/qaxserverbase.cpp b/src/activeqt/control/qaxserverbase.cpp index 5fa0aad..ce71490 100644 --- a/src/activeqt/control/qaxserverbase.cpp +++ b/src/activeqt/control/qaxserverbase.cpp @@ -1536,7 +1536,7 @@ HWND QAxServerBase::create(HWND hWndParent, RECT& rcPos) 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 @@ HMENU QAxServerBase::createPopup(QMenu *popup, HMENU oldMenu) 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 @@ void QAxServerBase::createMenu(QMenuBar *menuBar) 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()); |