diff options
| author | Tasuku Suzuki <tasuku.suzuki@nokia.com> | 2012-03-02 08:53:03 +0900 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-06 08:24:22 +0100 |
| commit | e3027377f0e7598c00b56962f08cb15b568f2356 (patch) | |
| tree | e33d0c473eec93ffa508c129d2e4beb56d6143b1 /src | |
| parent | cf785e0419f48dc24c35308d6dc61f1103980b3b (diff) | |
QWindow: fix crash on Mac
Fixes a crash when QWindow::baseSize() is invalid size.
Change-Id: I4e41f63d69ad0f218bfd35db8f30f18f92d4e9d5
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoawindow.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoawindow.mm b/src/plugins/platforms/cocoa/qcocoawindow.mm index b2e93470c9..3f566ccb44 100644 --- a/src/plugins/platforms/cocoa/qcocoawindow.mm +++ b/src/plugins/platforms/cocoa/qcocoawindow.mm @@ -201,7 +201,7 @@ void QCocoaWindow::propagateSizeHints() [m_nsWindow setResizeIncrements : qt_mac_toNSSize(window()->sizeIncrement())]; QSize baseSize = window()->baseSize(); - if (!baseSize.isNull()) { + if (!baseSize.isNull() && baseSize.isValid()) { [m_nsWindow setFrameSize : NSMakeSize(baseSize.width(), baseSize.height()) display : YES]; } } |