From 3cdc8dc4b6c8661d36bc7f218c41ef25d910858b Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Sun, 5 Jan 2020 19:15:28 +0100 Subject: [PATCH] Use QWidget::screen() with Qt 5.14 --- src/settings/settingsdialog.cpp | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/settings/settingsdialog.cpp b/src/settings/settingsdialog.cpp index ed492356d..8b7256a4d 100644 --- a/src/settings/settingsdialog.cpp +++ b/src/settings/settingsdialog.cpp @@ -21,8 +21,8 @@ #include "config.h" #include -#include #include +#include #include #include #include @@ -283,8 +283,12 @@ void SettingsDialog::showEvent(QShowEvent *e) { loading_settings_ = false; // Resize the dialog if it's too big - const QRect available = window()->windowHandle()->screen()->geometry(); - if (available.height() < height()) { +#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)) + QScreen *screen = QWidget::screen(); +#else + QScreen *screen = (window() && window()->windowHandle() ? window()->windowHandle()->screen() : QGuiApplication::primaryScreen()); +#endif + if (screen->availableGeometry().height() < height()) { resize(width(), sizeHint().height()); }