diff options
author | Jonathan Liu <net147@gmail.com> | 2012-02-14 23:27:32 +1100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-15 08:59:29 +0100 |
commit | 9c23257fe4ea4778433909e28a5af9895fdb7e24 (patch) | |
tree | 0c69cb4e2333b7a2c78e8f1e4101481fddd3ce5f /src/plugins | |
parent | 3296b7327bd84f420df7e5561d192c0a8d0bb409 (diff) |
Fix compilation with MinGW
Some headers and constants are available in MinGW-w64 that are not
available in the official MinGW. STATE_SYSTEM_HASPOPUP and
STATE_SYSTEM_PROTECTED constants are defined if they are not already
defined by including oleacc.h. _CrtSetReportMode is not used and
crtdbg.h is not included when using official MinGW as crtdbg.h is
missing from official MinGW.
Change-Id: Ie7f3f3726a1663d0fdeb6ee17b86873ae3f61860
Reviewed-by: Jonathan Liu <net147@gmail.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/plugins')
-rw-r--r-- | src/plugins/platforms/windows/qtwindows_additional.h | 3 | ||||
-rw-r--r-- | src/plugins/platforms/windows/qwindowsaccessibility.cpp | 2 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/plugins/platforms/windows/qtwindows_additional.h b/src/plugins/platforms/windows/qtwindows_additional.h index a85a798b9e..ab51f36c24 100644 --- a/src/plugins/platforms/windows/qtwindows_additional.h +++ b/src/plugins/platforms/windows/qtwindows_additional.h @@ -68,6 +68,9 @@ #if !defined(__MINGW64_VERSION_MAJOR) +#define STATE_SYSTEM_HASPOPUP 0x40000000 +#define STATE_SYSTEM_PROTECTED 0x20000000 + typedef struct tagUPDATELAYEREDWINDOWINFO { DWORD cbSize; HDC hdcDst; diff --git a/src/plugins/platforms/windows/qwindowsaccessibility.cpp b/src/plugins/platforms/windows/qwindowsaccessibility.cpp index e36e255947..3ef21fa0b7 100644 --- a/src/plugins/platforms/windows/qwindowsaccessibility.cpp +++ b/src/plugins/platforms/windows/qwindowsaccessibility.cpp @@ -84,6 +84,8 @@ #include "qguifunctions_wince.h" #endif +#include "qtwindows_additional.h" + QT_BEGIN_NAMESPACE //#define DEBUG_SHOW_ATCLIENT_COMMANDS |