diff options
| author | Morten Johan Sorvig <morten.sorvig@digia.com> | 2012-12-11 13:37:40 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2012-12-11 18:34:19 +0100 |
| commit | 4afc88b381128302c383a1d82ed93e6274bac9f1 (patch) | |
| tree | a2fd7dd57fa95b05ee0f6dca5fd9ac56640ee2bb /src/plugins/platforms/cocoa/qnsview.mm | |
| parent | ced154500de1dde42033579a7b29494934d8a02d (diff) | |
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 <gabriel.dedietrich@digia.com>
Diffstat (limited to 'src/plugins/platforms/cocoa/qnsview.mm')
| -rw-r--r-- | src/plugins/platforms/cocoa/qnsview.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/cocoa/qnsview.mm b/src/plugins/platforms/cocoa/qnsview.mm index cfd12cfb61..678f88baa0 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 |