From 8a66924ca000fe4e05b680ca82c6587da8d28e0b Mon Sep 17 00:00:00 2001 From: Marcel Krems Date: Thu, 15 Feb 2018 04:51:07 +0100 Subject: [PATCH] Fix compilation with QT_DISABLE_DEPRECATED_BEFORE=0x060000 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Regression introduced in b254b03dc3b1cfcfc5f17158d2470e0a9a946a0e Change-Id: I77e8718cc6be79d4fbea5510e8d7cc7808a609c2 Reviewed-by: Tor Arne Vestbø --- src/widgets/kernel/qdesktopwidget.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/widgets/kernel/qdesktopwidget.h b/src/widgets/kernel/qdesktopwidget.h index f53d0fe9bb6..f986f0db203 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