diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-05-19 13:58:24 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2020-05-20 08:26:52 +0200 |
| commit | 55b91dc4714d36d457fbfa32bc6b412415362430 (patch) | |
| tree | 743eecbb2dd41f98fb9ecd0f4d29eea023524960 | |
| parent | 463299b8c9b8f2ce28126aa8180f7103112d1947 (diff) | |
Fix deprecated/removed code
- Port away from QDesktopWidget
- Use QFontMetrics::horizontalAdvance() instead of width()
Pick-to: 5.15
Change-Id: I5d721fa574356a27e414545d6b9b2d28d400080b
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
| -rw-r--r-- | examples/activeqt/hierarchy/objects.cpp | 2 | ||||
| -rw-r--r-- | examples/activeqt/mediaplayer/main.cpp | 4 | ||||
| -rw-r--r-- | src/activeqt/container/qaxselect.cpp | 4 | ||||
| -rw-r--r-- | tools/testcon/main.cpp | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/examples/activeqt/hierarchy/objects.cpp b/examples/activeqt/hierarchy/objects.cpp index c28cd85..af9d966 100644 --- a/examples/activeqt/hierarchy/objects.cpp +++ b/examples/activeqt/hierarchy/objects.cpp @@ -104,7 +104,7 @@ QString QSubWidget::label() const QSize QSubWidget::sizeHint() const { QFontMetrics fm(font()); - return QSize(fm.width(m_label), fm.height()); + return QSize(fm.horizontalAdvance(m_label), fm.height()); } void QSubWidget::paintEvent(QPaintEvent *) diff --git a/examples/activeqt/mediaplayer/main.cpp b/examples/activeqt/mediaplayer/main.cpp index c20f262..2f84d83 100644 --- a/examples/activeqt/mediaplayer/main.cpp +++ b/examples/activeqt/mediaplayer/main.cpp @@ -51,7 +51,7 @@ #include <QApplication> #include <QMessageBox> #include <QMainWindow> -#include <QDesktopWidget> +#include <QScreen> #include <QVariant> #include <QSettings> #include <QFileDialog> @@ -90,7 +90,7 @@ MainWindow::MainWindow() const QByteArray restoredGeometry = settings.value(QLatin1String(geometryKey)).toByteArray(); if (restoredGeometry.isEmpty() || !restoreGeometry(restoredGeometry)) { - const QRect availableGeometry = QApplication::desktop()->availableGeometry(this); + const QRect availableGeometry = screen()->availableGeometry(); const QSize size = (availableGeometry.size() * 4) / 5; resize(size); move(availableGeometry.center() - QPoint(size.width(), size.height()) / 2); diff --git a/src/activeqt/container/qaxselect.cpp b/src/activeqt/container/qaxselect.cpp index 30af521..e2642aa 100644 --- a/src/activeqt/container/qaxselect.cpp +++ b/src/activeqt/container/qaxselect.cpp @@ -57,7 +57,7 @@ #include <QtCore/qitemselectionmodel.h> #include <QtCore/qsysinfo.h> #include <QtCore/qtextstream.h> -#include <QtWidgets/qdesktopwidget.h> +#include <QtGui/qscreen.h> #include <QtWidgets/qpushbutton.h> #include <qt_windows.h> @@ -362,7 +362,7 @@ QAxSelect::QAxSelect(QWidget *parent, Qt::WindowFlags flags) d->selectUi.setupUi(this); d->setOkButtonEnabled(false); - const QRect availableGeometry = QApplication::desktop()->availableGeometry(this); + const QRect availableGeometry = screen()->availableGeometry(); resize(availableGeometry.width() / 4, availableGeometry.height() * 2 / 3); #ifndef QT_NO_CURSOR diff --git a/tools/testcon/main.cpp b/tools/testcon/main.cpp index 7c2ca07..e1b5c29 100644 --- a/tools/testcon/main.cpp +++ b/tools/testcon/main.cpp @@ -29,11 +29,11 @@ #include "mainwindow.h" #include <QApplication> +#include <QScreen> #include <QAxFactory> #include <QCommandLineParser> #include <QCommandLineOption> #include <QDebug> -#include <QDesktopWidget> QAXFACTORY_BEGIN( "{4a43e44d-9d1d-47e5-a1e5-58fe6f7be0a4}", // type library ID @@ -104,7 +104,7 @@ int main( int argc, char **argv ) if (parser.isSet(scriptOption)) mw.loadScript(parser.value(scriptOption)); - const QRect availableGeometry = QApplication::desktop()->availableGeometry(&mw); + const QRect availableGeometry = mw.screen()->availableGeometry(); mw.resize(availableGeometry.size() * 2 / 3); mw.show(); |