Merge pull request #6511 from jonaski/screen

Use QWidget::screen() to fix compile with Qt 5.14
This commit is contained in:
John Maguire 2020-01-05 15:22:38 +00:00 committed by GitHub
commit 19389cace7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 4 deletions

View File

@ -247,7 +247,7 @@ QDialog* AlbumCoverChoiceController::ShowCoverPrivate(const Song& song) {
// if the cover is larger than the screen, resize the window
// 85% seems to be enough to account for title bar and taskbar etc.
#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
QScreen* screen = screen();
QScreen* screen = QWidget::screen();
#else
QScreen* screen =
(window() && window()->windowHandle() ? window()->windowHandle()->screen()

View File

@ -306,7 +306,7 @@ void SettingsDialog::showEvent(QShowEvent* e) {
// Resize the dialog if it's too big
#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
QScreen* screen = screen();
QScreen* screen = QWidget::screen();
#else
QScreen* screen =
(window() && window()->windowHandle() ? window()->windowHandle()->screen()

View File

@ -650,7 +650,7 @@ void NowPlayingWidget::SearchCoverAutomatically() {
void NowPlayingWidget::Bask() {
#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
QScreen* screen = screen();
QScreen* screen = QWidget::screen();
#else
QScreen* screen =
(window() && window()->windowHandle() ? window()->windowHandle()->screen()

View File

@ -198,7 +198,7 @@ void PrettyImage::ShowFullsize() {
// Work out how large to make the window, based on the size of the screen
#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
QScreen* screen = screen();
QScreen* screen = QWidget::screen();
#else
QScreen* screen =
(window() && window()->windowHandle() ? window()->windowHandle()->screen()