diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-10-07 01:00:08 +0200 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2018-10-08 10:00:49 +0200 |
| commit | b4da5c6b931fb726fade891448f01c266cb3c115 (patch) | |
| tree | 2f9289340da1470cf317f6670f309968da7f18e8 /src/plugins/platforms | |
| parent | 05b8ba51550127c85cd2db5cb819b695b56c57ce (diff) | |
| parent | 7146c9075c85cb46cb38b57ded3e12dfa6cbef66 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
Conflicts:
src/corelib/tools/qtimezoneprivate.cpp
Change-Id: Icbb5999d378711ce3786a4fe0aba176a45ac702c
Diffstat (limited to 'src/plugins/platforms')
| -rw-r--r-- | src/plugins/platforms/windows/qwindowscontext.cpp | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/plugins/platforms/windows/qwindowscontext.cpp b/src/plugins/platforms/windows/qwindowscontext.cpp index 9bce72d853..253aeb9d76 100644 --- a/src/plugins/platforms/windows/qwindowscontext.cpp +++ b/src/plugins/platforms/windows/qwindowscontext.cpp @@ -963,7 +963,6 @@ static inline bool isInputMessage(UINT m) case WM_TOUCH: case WM_MOUSEHOVER: case WM_MOUSELEAVE: - case WM_NCHITTEST: case WM_NCMOUSEHOVER: case WM_NCMOUSELEAVE: case WM_SIZING: |