1 files changed, 9 insertions, 6 deletions
diff --git a/src/widgets/kernel/qwidget_qpa.cpp b/src/widgets/kernel/qwidget_qpa.cpp
index 85ae55b8ac..c22320e8d2 100644
--- a/src/widgets/kernel/qwidget_qpa.cpp
+++ b/src/widgets/kernel/qwidget_qpa.cpp
@@ -834,13 +834,16 @@ int QWidget::metric(PaintDeviceMetric m) const
 {
     Q_D(const QWidget);
 
+    QWindow *topLevelWindow = 0;
     QScreen *screen = 0;
     if (QWidget *topLevel = window())
-        if (QWindow *topLevelWindow = topLevel->windowHandle()) {
-            QPlatformScreen *platformScreen = QPlatformScreen::platformScreenForWindow(topLevelWindow);
-            if (platformScreen)
-                screen = platformScreen->screen();
-        }
+        topLevelWindow = topLevel->windowHandle();
+
+    if (topLevelWindow) {
+        QPlatformScreen *platformScreen = QPlatformScreen::platformScreenForWindow(topLevelWindow);
+        if (platformScreen)
+            screen = platformScreen->screen();
+    }
     if (!screen && QGuiApplication::primaryScreen())
         screen = QGuiApplication::primaryScreen();
 
@@ -877,7 +880,7 @@ int QWidget::metric(PaintDeviceMetric m) const
     } else if (m == PdmPhysicalDpiY) {
         return qRound(screen->physicalDotsPerInchY());
     } else if (m == PdmDevicePixelRatio) {
-        return screen->devicePixelRatio();
+        return topLevelWindow ? topLevelWindow->devicePixelRatio() : qApp->devicePixelRatio();
     } else {
         val = QPaintDevice::metric(m);// XXX
     }