diff options
| author | Marcel Krems <m.krems@software-vision.eu> | 2018-02-15 04:51:07 +0100 |
|---|---|---|
| committer | Marcel Krems <m.krems@software-vision.eu> | 2018-02-16 22:45:48 +0000 |
| commit | 8a66924ca000fe4e05b680ca82c6587da8d28e0b (patch) | |
| tree | 5f3b093ec1ee3df765704cf2eb5b7c4f972475a6 | |
| parent | 5d3ce3a64090ccd3c38b235edf6228f41d003274 (diff) | |
Fix compilation with QT_DISABLE_DEPRECATED_BEFORE=0x060000
Regression introduced in b254b03dc3b1cfcfc5f17158d2470e0a9a946a0e
Change-Id: I77e8718cc6be79d4fbea5510e8d7cc7808a609c2
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
| -rw-r--r-- | src/widgets/kernel/qdesktopwidget.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/widgets/kernel/qdesktopwidget.h b/src/widgets/kernel/qdesktopwidget.h index f53d0fe9bb..f986f0db20 100644 --- a/src/widgets/kernel/qdesktopwidget.h +++ b/src/widgets/kernel/qdesktopwidget.h @@ -112,6 +112,7 @@ private: friend class QApplicationPrivate; }; +#if QT_DEPRECATED_SINCE(5, 11) inline int QDesktopWidget::screenCount() const { QT_WARNING_PUSH @@ -119,6 +120,7 @@ QT_WARNING_DISABLE_DEPRECATED return numScreens(); QT_WARNING_POP } +#endif QT_END_NAMESPACE |