summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMorten Johan Sørvig <morten.sorvig@digia.com>2014-01-23 13:38:39 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-02-26 12:58:00 +0100
commitcea3f4d5357ae4417ff3624ecca32f9cd5d4c260 (patch)
treeebb546428f4564e4099c0000ad6da4306343c74e /src
parent98405c41c2d824a981fd9afd9d53a74c4b9ac562 (diff)
Cocoa: Set geometry for foreign views.
Make sure QPlatformWindow::setGeometry is called for the QWindow::fromWinId() case where there is no QNSView. Change-Id: I72dd11a0eb0f3cfbd09b87ffeac86f2a826e0192 Reviewed-by: Morten Johan Sørvig <morten.sorvig@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/plugins/platforms/cocoa/qcocoawindow.mm3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm
index 07b4100d4a..9321c1a48b 100644
--- a/src/plugins/platforms/cocoa/qcocoawindow.mm
+++ b/src/plugins/platforms/cocoa/qcocoawindow.mm
@@ -398,6 +398,9 @@ void QCocoaWindow::setCocoaGeometry(const QRect &rect)
[m_contentView setFrame : NSMakeRect(rect.x(), rect.y(), rect.width(), rect.height())];
}
+ if (!m_qtView)
+ QPlatformWindow::setGeometry(rect);
+
// will call QPlatformWindow::setGeometry(rect) during resize confirmation (see qnsview.mm)
}