From 5a46251de36e568513bca70b82a1d6cc9c9cb0f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Morten=20Johan=20S=C3=B8rvig?= <morten.sorvig@digia.com>
Date: Tue, 29 Jan 2013 09:11:21 +0100
Subject: [PATCH] Fix devicePixelRatio getter for embedded QWindows.

m_nsWindow is not set for non-toplevel QWindows,
causing devicePixelRatio to always return 1.

Use [m_contentView window] instead.

Change-Id: I6689a70812c9484f103b5e706fe4c1b76406b750
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
---
 src/plugins/platforms/cocoa/qcocoawindow.mm | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm
index 14d62c9fca..45100f9906 100644
--- a/src/plugins/platforms/cocoa/qcocoawindow.mm
+++ b/src/plugins/platforms/cocoa/qcocoawindow.mm
@@ -837,11 +837,9 @@ QCocoaMenuBar *QCocoaWindow::menubar() const
 
 qreal QCocoaWindow::devicePixelRatio() const
 {
-    if (!m_nsWindow)
-        return 1.0;
 #if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_7
     if (QSysInfo::MacintoshVersion >= QSysInfo::MV_10_7) {
-        return qreal([m_nsWindow backingScaleFactor]);
+        return qreal([[m_contentView window] backingScaleFactor]);
     } else
 #endif
     {