From f15aa1fd84e46dfc4d9a78b3a7ba482e42abd9c1 Mon Sep 17 00:00:00 2001
From: Volker Hilsheimer <volker.hilsheimer@qt.io>
Date: Tue, 25 Feb 2020 16:01:58 +0100
Subject: [PATCH] QDockWidget: mark AllDockWidgetFeatures enum value as
 deprecated

As per ### Qt 6 comment, and the documentation which already suggests
to specify the individual flags instead.

Change-Id: Id236b7b13024a15fc7ad483b9481361b2ac43a02
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
---
 src/widgets/widgets/qdockwidget.h | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/widgets/widgets/qdockwidget.h b/src/widgets/widgets/qdockwidget.h
index b53a991dae1..36dff4d420c 100644
--- a/src/widgets/widgets/qdockwidget.h
+++ b/src/widgets/widgets/qdockwidget.h
@@ -78,7 +78,10 @@ public:
         DockWidgetVerticalTitleBar = 0x08,
 
         DockWidgetFeatureMask = 0x0f,
-        AllDockWidgetFeatures = DockWidgetClosable|DockWidgetMovable|DockWidgetFloatable, // ### Qt 6: remove
+#if QT_DEPRECATED_SINCE(5, 15)
+        AllDockWidgetFeatures Q_DECL_ENUMERATOR_DEPRECATED =
+            DockWidgetClosable|DockWidgetMovable|DockWidgetFloatable, // ### Qt 6: remove
+#endif
         NoDockWidgetFeatures  = 0x00,
 
         Reserved              = 0xff