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

Fix compilation with QT_DISABLE_DEPRECATED_BEFORE=0x060000

Browse Source 
Regression introduced in b254b03dc3b1cfcfc5f17158d2470e0a9a946a0e

Change-Id: I77e8718cc6be79d4fbea5510e8d7cc7808a609c2
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
This commit is contained in:
Marcel Krems 2018-02-15 04:51:07 +01:00
parent 5d3ce3a640
commit 8a66924ca0
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/qdesktopwidget.h
View File

@ -112,6 +112,7 @@ private:
friend class QApplicationPrivate; friend class QApplicationPrivate;
}; };
#if QT_DEPRECATED_SINCE(5, 11)
inline int QDesktopWidget::screenCount() const inline int QDesktopWidget::screenCount() const
{ {
QT_WARNING_PUSH QT_WARNING_PUSH
@ -119,6 +120,7 @@ QT_WARNING_DISABLE_DEPRECATED
return numScreens(); return numScreens();
QT_WARNING_POP QT_WARNING_POP
} }
#endif
QT_END_NAMESPACE QT_END_NAMESPACE