diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2016-05-17 16:52:54 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2016-05-17 16:11:23 +0000 |
| commit | 0d5b2422ce278a2fc7d99b7f1a9b10f5d90b8c58 (patch) | |
| tree | e79b4a37adc595cacc32d06563904959e1ba4565 /src/plugins/platforms/windows/qtwindowsglobal.h | |
| parent | 03e9c6f4a62582837fc9f5961ecbccd0a3d1b5d6 (diff) | |
Windows QPA: Remove qtwindows_additional.h.
Clean up helper definitions required for old SDKs and MinGW and
move the remaining ones to the files that require them.
Ensure compilations with MinGW 4.9.
Task-number: QTBUG-51673
Change-Id: I607989dd1d9197f237c6d021209a2c94aeb84021
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
Diffstat (limited to 'src/plugins/platforms/windows/qtwindowsglobal.h')
| -rw-r--r-- | src/plugins/platforms/windows/qtwindowsglobal.h | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/src/plugins/platforms/windows/qtwindowsglobal.h b/src/plugins/platforms/windows/qtwindowsglobal.h index cb85856787..ec6a8f62ae 100644 --- a/src/plugins/platforms/windows/qtwindowsglobal.h +++ b/src/plugins/platforms/windows/qtwindowsglobal.h @@ -41,9 +41,21 @@ #ifndef QTWINDOWSGLOBAL_H #define QTWINDOWSGLOBAL_H -#include "qtwindows_additional.h" +#include <QtCore/qt_windows.h> #include <QtCore/qnamespace.h> +#ifndef WM_DWMCOMPOSITIONCHANGED // MinGW. +# define WM_DWMCOMPOSITIONCHANGED 0x31E +#endif + +#ifndef WM_TOUCH +# define WM_TOUCH 0x0240 +#endif + +#ifndef WM_GESTURE +# define WM_GESTURE 0x0119 +#endif + QT_BEGIN_NAMESPACE namespace QtWindows |