diff options
| author | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-02-25 16:01:58 +0100 |
|---|---|---|
| committer | Volker Hilsheimer <volker.hilsheimer@qt.io> | 2020-02-26 23:09:06 +0100 |
| commit | f15aa1fd84e46dfc4d9a78b3a7ba482e42abd9c1 (patch) | |
| tree | 7f3dc1844b33ec9e55c9af5e927b7ba0ad93b251 /src/widgets/widgets/qdockwidget.h | |
| parent | fd4be84d23a0db4186cb42e736a9de3af722c7f7 (diff) | |
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>
Diffstat (limited to 'src/widgets/widgets/qdockwidget.h')
| -rw-r--r-- | src/widgets/widgets/qdockwidget.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/widgets/widgets/qdockwidget.h b/src/widgets/widgets/qdockwidget.h index b53a991dae..36dff4d420 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 |