From 4afc88b381128302c383a1d82ed93e6274bac9f1 Mon Sep 17 00:00:00 2001 From: Morten Johan Sorvig Date: Tue, 11 Dec 2012 13:37:40 +0100 Subject: [PATCH] Partially revert e84e86dc. Make tst_qquickview::resizemodeitem pass. Returning on equal geometry breaks for non-top-level windows. Change-Id: I3b361655e25b6cf2d5e29410dc1f3567ab8f54d9 Reviewed-by: Gabriel de Dietrich --- src/plugins/platforms/cocoa/qnsview.mm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/plugins/platforms/cocoa/qnsview.mm b/src/plugins/platforms/cocoa/qnsview.mm index cfd12cf..678f88b 100644 --- a/src/plugins/platforms/cocoa/qnsview.mm +++ b/src/plugins/platforms/cocoa/qnsview.mm @@ -185,7 +185,7 @@ static QTouchDevice *touchDevice = 0; geometry = qt_mac_toQRect([self frame]); } - if (geometry == m_platformWindow->geometry()) + if (m_platformWindow->m_nsWindow && geometry == m_platformWindow->geometry()) return; #ifdef QT_COCOA_ENABLE_WINDOW_DEBUG -- 2.7.4