Qt5: QDesktopWidget is deprecated use QScreen [-Wdeprecated-declarations]

This commit is contained in:
wmayer
2020-06-11 02:21:57 +02:00
committed by wwmayer
parent deb39c4321
commit eced0cb568
6 changed files with 48 additions and 0 deletions

View File

@@ -34,6 +34,10 @@
# include <QScrollBar>
#endif
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
# include <QScreen>
#endif
#include <Base/Exception.h>
#include <Base/Console.h>
#include <App/Application.h>
@@ -307,7 +311,11 @@ void DlgPreferencesImp::resizeEvent(QResizeEvent* ev)
if (canEmbedScrollArea) {
// embed the widget stack into a scroll area if the size is
// bigger than the available desktop
#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
QRect rect = QApplication::primaryScreen()->availableGeometry();
#else
QRect rect = QApplication::desktop()->availableGeometry();
#endif
int maxHeight = rect.height() - 60;
int maxWidth = rect.width();
if (height() > maxHeight || width() > maxWidth) {