diff options
author | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2016-04-15 09:03:22 +0200 |
---|---|---|
committer | Friedemann Kleint <Friedemann.Kleint@theqtcompany.com> | 2016-04-20 08:00:46 +0000 |
commit | 2be25273e1fc81c5a9e5124f1444100bdb3d458a (patch) | |
tree | 864cb758806fbf94c784b5207c2e5d972e109c19 /src/corelib/global/qnamespace.h | |
parent | b2bfac12a1efd1d1eeda06f1bd84b86524a163cd (diff) |
Remove window flags WindowOkButtonHint, WindowCancelButtonHint.
They were duplicating other enumeration values
(WindowTransparentForInput, WindowOverridesSystemGestures) and were
only supported on Windows CE.
Task-number: QTBUG-42897
Task-number: QTBUG-51673
Change-Id: I993a933ee2a3dc8a0ebd7ba6aef80b456f50a657
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>
Diffstat (limited to 'src/corelib/global/qnamespace.h')
-rw-r--r-- | src/corelib/global/qnamespace.h | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h index fc7ca9b216..68c469db49 100644 --- a/src/corelib/global/qnamespace.h +++ b/src/corelib/global/qnamespace.h @@ -301,12 +301,7 @@ public: MacWindowToolBarButtonHint = 0x10000000, BypassGraphicsProxyWidget = 0x20000000, NoDropShadowWindowHint = 0x40000000, - WindowFullscreenButtonHint = 0x80000000, - - // The following enums have overlapping values with other enums. - // This was not intentional, but it's too late to change now. - WindowOkButtonHint = 0x00080000, // WindowTransparentForInput - WindowCancelButtonHint = 0x00100000 // WindowOverridesSystemGestures + WindowFullscreenButtonHint = 0x80000000 }; Q_DECLARE_FLAGS(WindowFlags, WindowType) |