summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorjaanttil <janne.anttila@digia.com>2011-11-14 14:16:39 (GMT)
committerQt by Nokia <qt-info@nokia.com>2012-01-31 10:31:04 (GMT)
commit17edd41c1e3bcb4743b5c6cee5ecd9e1a1cf09b4 (patch)
treed5643c0dfa392dea8043824311b2b4a447990a7f /src
parent686828d1b8171dfc73b07ed09510af4743935038 (diff)
downloadQt-17edd41c1e3bcb4743b5c6cee5ecd9e1a1cf09b4.zip
Qt-17edd41c1e3bcb4743b5c6cee5ecd9e1a1cf09b4.tar.gz
Qt-17edd41c1e3bcb4743b5c6cee5ecd9e1a1cf09b4.tar.bz2
Fixed qapplication_win.cpp build for WinCE
Change-Id: I206fbb5e137676bb56d251870928826876dc2bb2 Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@nokia.com>
Diffstat (limited to 'src')
-rw-r--r--src/gui/kernel/qapplication_win.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qapplication_win.cpp b/src/gui/kernel/qapplication_win.cpp
index 69fe7ab..e6ebf2b 100644
--- a/src/gui/kernel/qapplication_win.cpp
+++ b/src/gui/kernel/qapplication_win.cpp
@@ -2360,6 +2360,7 @@ extern "C" LRESULT QT_WIN_CALLBACK QtWndProc(HWND hwnd, UINT message, WPARAM wPa
#ifndef QT_NO_ACCESSIBILITY
case WM_GETOBJECT:
{
+#if !defined(Q_OS_WINCE)
/* On Win64, lParam can be 0x00000000fffffffc or 0xfffffffffffffffc (!),
but MSDN says that lParam should be converted to a DWORD
before its compared against OBJID_CLIENT
@@ -2371,7 +2372,6 @@ extern "C" LRESULT QT_WIN_CALLBACK QtWndProc(HWND hwnd, UINT message, WPARAM wPa
break;
}
-#if !defined(Q_OS_WINCE)
typedef LRESULT (WINAPI *PtrLresultFromObject)(REFIID, WPARAM, LPUNKNOWN);
static PtrLresultFromObject ptrLresultFromObject = 0;
static bool oleaccChecked = false;