diff options
Diffstat (limited to 'examples/activeqt')
| -rw-r--r-- | examples/activeqt/hierarchy/objects.cpp | 2 | ||||
| -rw-r--r-- | examples/activeqt/mediaplayer/main.cpp | 4 |
2 files changed, 3 insertions, 3 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); |