1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QDockWidget: mark AllDockWidgetFeatures enum value as deprecated

Browse Source 
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>
This commit is contained in:
Volker Hilsheimer 2020-02-25 16:01:58 +01:00
parent fd4be84d23
commit f15aa1fd84
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/widgets/widgets/qdockwidget.h
View File

@ -78,7 +78,10 @@ public:
DockWidgetVerticalTitleBar = 0x08, DockWidgetVerticalTitleBar = 0x08,
DockWidgetFeatureMask = 0x0f, 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, NoDockWidgetFeatures = 0x00,
Reserved = 0xff Reserved = 0xff