From fe1fb593ae52fa3e4069826f123cc9fe6705e92d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?=
 <tor.arne.vestbo@theqtcompany.com>
Date: Thu, 19 Mar 2015 13:09:00 +0100
Subject: [PATCH] Make it explicit that a few Qt::WindowFlags are overlapping

Change-Id: Ia161fb9b7196d139e22fe7b3b576c5c72ee8a2f1
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
---
 src/corelib/global/qnamespace.h | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/corelib/global/qnamespace.h b/src/corelib/global/qnamespace.h
index 79ddf81b38..82b383e69c 100644
--- a/src/corelib/global/qnamespace.h
+++ b/src/corelib/global/qnamespace.h
@@ -294,10 +294,13 @@ public:
         WindowCloseButtonHint = 0x08000000,
         MacWindowToolBarButtonHint = 0x10000000,
         BypassGraphicsProxyWidget = 0x20000000,
-        WindowOkButtonHint = 0x00080000,
-        WindowCancelButtonHint = 0x00100000,
         NoDropShadowWindowHint = 0x40000000,
-        WindowFullscreenButtonHint = 0x80000000
+        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
     };
 
     Q_DECLARE_FLAGS(WindowFlags, WindowType)