diff options
| -rw-r--r-- | .qmake.conf | 2 | ||||
| -rw-r--r-- | examples/svg/svgviewer/exportdialog.cpp | 4 | ||||
| -rw-r--r-- | examples/svg/svgviewer/mainwindow.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/.qmake.conf b/.qmake.conf index c6f1702..1121008 100644 --- a/.qmake.conf +++ b/.qmake.conf @@ -3,4 +3,4 @@ load(qt_build_config) CONFIG += warning_clean DEFINES += QT_NO_FOREACH -MODULE_VERSION = 5.14.0 +MODULE_VERSION = 5.15.0 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; |