1 files changed, 10 insertions, 3 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm
index d972782f31..bf41270d12 100644
--- a/src/plugins/platforms/cocoa/qcocoawindow.mm
+++ b/src/plugins/platforms/cocoa/qcocoawindow.mm
@@ -392,12 +392,15 @@ void QCocoaWindow::setCocoaGeometry(const QRect &rect)
         QWindowSystemInterface::handleGeometryChange(window(), rect);
         QWindowSystemInterface::handleExposeEvent(window(), rect);
     } else if (m_nsWindow) {
-        NSRect bounds = qt_mac_flipRect(rect, window());
+        NSRect bounds = qt_mac_flipRect(rect);
         [m_nsWindow setFrame:[m_nsWindow frameRectForContentRect:bounds] display:YES animate:NO];
     } else {
         [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)
 }
 
@@ -415,7 +418,7 @@ void QCocoaWindow::clipWindow(const NSRect &clipRect)
 
     NSRect clippedWindowRect = NSZeroRect;
     if (!NSIsEmptyRect(clipRect)) {
-        NSRect windowFrame = qt_mac_flipRect(QRect(window()->mapToGlobal(QPoint(0, 0)), geometry().size()), window());
+        NSRect windowFrame = qt_mac_flipRect(QRect(window()->mapToGlobal(QPoint(0, 0)), geometry().size()));
         clippedWindowRect = NSIntersectionRect(windowFrame, clipRect);
         // Clipping top/left offsets the content. Move it back.
         NSPoint contentViewOffset = NSMakePoint(qMax(CGFloat(0), NSMinX(clippedWindowRect) - NSMinX(windowFrame)),
@@ -1153,6 +1156,10 @@ void QCocoaWindow::recreateWindow(const QPlatformWindow *parentWindow)
         // Child windows have no NSWindow, link the NSViews instead.
         [m_parentCocoaWindow->m_contentView addSubview : m_contentView];
         QRect rect = window()->geometry();
+        // Prevent setting a (0,0) window size; causes opengl context
+        // "Invalid Drawable" warnings.
+        if (rect.isNull())
+            rect.setSize(QSize(1, 1));
         NSRect frame = NSMakeRect(rect.x(), rect.y(), rect.width(), rect.height());
         [m_contentView setFrame:frame];
         [m_contentView setHidden: YES];
@@ -1201,7 +1208,7 @@ NSWindow * QCocoaWindow::createNSWindow()
     QCocoaAutoReleasePool pool;
 
     QRect rect = initialGeometry(window(), window()->geometry(), defaultWindowWidth, defaultWindowHeight);
-    NSRect frame = qt_mac_flipRect(rect, window());
+    NSRect frame = qt_mac_flipRect(rect);
 
     Qt::WindowType type = window()->type();
     Qt::WindowFlags flags = window()->flags();