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

Fix a build when QT_DISABLE_DEPRECATED_BEFORE is set to 6.1.0

Browse Source 
Amends: ff8d757e222d0b9b8618b83e6c4186e366e917e9

Task-number: QTBUG-93033
Change-Id: I67b7bda0f63fdb3c4e1864e38c872b96df90a8ae
Reviewed-by: Christian Ehrlicher <ch.ehrlicher@gmx.de>
(cherry picked from commit 43d6778ce59266067d2fb5adf88a1ba3f73b29ae)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
This commit is contained in:
Jarek Kobus 2021-04-23 10:44:17 +02:00 committed by Qt Cherry-pick Bot
parent 6720519af7
commit e51e5c5840
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/widgets/kernel/qwidget.h
View File

@ -762,8 +762,10 @@ inline Qt::WindowType QWidget::windowType() const
inline Qt::WindowFlags QWidget::windowFlags() const inline Qt::WindowFlags QWidget::windowFlags() const
{ return data->window_flags; } { return data->window_flags; }
#if QT_DEPRECATED_SINCE(6, 1)
inline bool QWidget::isTopLevel() const inline bool QWidget::isTopLevel() const
{ return (windowType() & Qt::Window); } { return (windowType() & Qt::Window); }
#endif
inline bool QWidget::isWindow() const inline bool QWidget::isWindow() const
{ return (windowType() & Qt::Window); } { return (windowType() & Qt::Window); }