projects
/
profile
/
ivi
/
qtbase.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
cf785e0
)
QWindow: fix crash on Mac
author
Tasuku Suzuki
<tasuku.suzuki@nokia.com>
Thu, 1 Mar 2012 23:53:03 +0000
(08:53 +0900)
committer
Qt by Nokia
<qt-info@nokia.com>
Tue, 6 Mar 2012 07:24:22 +0000
(08:24 +0100)
Fixes a crash when QWindow::baseSize() is invalid size.
Change-Id: I4e41f63d69ad0f218bfd35db8f30f18f92d4e9d5
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
src/plugins/platforms/cocoa/qcocoawindow.mm
patch
|
blob
|
history
diff --git
a/src/plugins/platforms/cocoa/qcocoawindow.mm
b/src/plugins/platforms/cocoa/qcocoawindow.mm
index
b2e9347
..
3f566cc
100644
(file)
--- 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];
}
}