diff options
author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-17 03:05:38 +0200 |
---|---|---|
committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-09-17 03:05:38 +0200 |
commit | 5d59582d5be26e3e81c3bd263c466cde3d0f121c (patch) | |
tree | 37fa7b41fc414ffd0267c043323c12b859a5012a | |
parent | 7831afe0d496794cdc7a7ffbf1b374120941c3ea (diff) | |
parent | 1684d3122b7263787f2167668fd2b16a3738bf94 (diff) | |
download | qtsvg-5d59582d5be26e3e81c3bd263c466cde3d0f121c.tar.gz |
Merge remote-tracking branch 'origin/5.15' into dev
Change-Id: I428c98f1fa2b94c8c2ac388a6c696da06512a172
-rw-r--r-- | examples/svg/svgviewer/exportdialog.cpp | 4 | ||||
-rw-r--r-- | examples/svg/svgviewer/mainwindow.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/examples/svg/svgviewer/exportdialog.cpp b/examples/svg/svgviewer/exportdialog.cpp index f6c7b90..f0d388d 100644 --- a/examples/svg/svgviewer/exportdialog.cpp +++ b/examples/svg/svgviewer/exportdialog.cpp @@ -51,7 +51,6 @@ #include "exportdialog.h" #include <QApplication> -#include <QDesktopWidget> #include <QDialogButtonBox> #include <QFileDialog> #include <QFormLayout> @@ -60,6 +59,7 @@ #include <QLabel> #include <QLineEdit> #include <QPushButton> +#include <QScreen> #include <QSpinBox> #include <QToolButton> #include <QVBoxLayout> @@ -89,7 +89,7 @@ ExportDialog::ExportDialog(QWidget *parent) QHBoxLayout *fileLayout = new QHBoxLayout; fileLayout->addWidget(m_fileNameLineEdit); - m_fileNameLineEdit->setMinimumWidth(QApplication::desktop()->availableGeometry(this).width() / 6); + m_fileNameLineEdit->setMinimumWidth(this->screen()->availableGeometry() .width() / 6); QPushButton *browseButton = new QPushButton(tr("Browse..."), this); fileLayout->addWidget(browseButton); connect(browseButton, &QAbstractButton::clicked, this, &ExportDialog::browse); diff --git a/examples/svg/svgviewer/mainwindow.cpp b/examples/svg/svgviewer/mainwindow.cpp index d095416..f67837e 100644 --- a/examples/svg/svgviewer/mainwindow.cpp +++ b/examples/svg/svgviewer/mainwindow.cpp @@ -179,7 +179,7 @@ bool MainWindow::loadFile(const QString &fileName) m_outlineAction->setEnabled(true); m_backgroundAction->setEnabled(true); - const QSize availableSize = QApplication::desktop()->availableGeometry(this).size(); + const QSize availableSize = this->screen()->availableGeometry().size(); resize(m_view->sizeHint().expandedTo(availableSize / 4) + QSize(80, 80 + menuBar()->height())); return true; |