diff options
| -rw-r--r-- | src/plugins/platforms/windows/qtwindows_additional.h | 3 | ||||
| -rw-r--r-- | src/plugins/platforms/windows/qwindowsaccessibility.cpp | 2 | ||||
| -rw-r--r-- | src/testlib/qtestcase.cpp | 6 |
3 files changed, 10 insertions, 1 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 diff --git a/src/testlib/qtestcase.cpp b/src/testlib/qtestcase.cpp index 76bea243b1..549d16b997 100644 --- a/src/testlib/qtestcase.cpp +++ b/src/testlib/qtestcase.cpp @@ -70,7 +70,9 @@ #ifdef Q_OS_WIN #ifndef Q_OS_WINCE -# include <crtdbg.h> +# if !defined(Q_CC_MINGW) || (defined(Q_CC_MINGW) && defined(__MINGW64_VERSION_MAJOR)) +# include <crtdbg.h> +# endif #endif #include <windows.h> // for Sleep #endif @@ -1947,7 +1949,9 @@ int QTest::qExec(QObject *testObject, int argc, char **argv) #endif #if defined(Q_OS_WIN) && !defined(Q_OS_WINCE) +# if !defined(Q_CC_MINGW) || (defined(Q_CC_MINGW) && defined(__MINGW64_VERSION_MAJOR)) _CrtSetReportMode(_CRT_ERROR, _CRTDBG_MODE_DEBUG); +# endif SetErrorMode(SetErrorMode(0) | SEM_NOGPFAULTERRORBOX); #endif |