diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-05-19 08:49:03 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-05-19 08:49:03 (GMT) |
| commit | c6f8b600cb1635bef425b3d2232213fb41ea96bd (patch) | |
| tree | 77f384a62f76de02d9765d615966327b91e4bb4a /src/gui/kernel | |
| parent | 6cc1e0106845a0dfe9433c4413b3c064c73ccfe2 (diff) | |
| parent | 9f9ede616079998f8ba7bf6fd446f39ce74b0400 (diff) | |
| download | Qt-c6f8b600cb1635bef425b3d2232213fb41ea96bd.zip Qt-c6f8b600cb1635bef425b3d2232213fb41ea96bd.tar.gz Qt-c6f8b600cb1635bef425b3d2232213fb41ea96bd.tar.bz2 | |
Merge branch 'master' of git@scm.dev.nokia.troll.no:qt/qt
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qwidget_mac.mm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm index cc291e3..8243f32 100644 --- a/src/gui/kernel/qwidget_mac.mm +++ b/src/gui/kernel/qwidget_mac.mm @@ -4025,8 +4025,8 @@ void QWidgetPrivate::applyMaxAndMinSizeOnWindow() NSSize max = NSMakeSize(SF(extra->maxw), SF(extra->maxh)); NSSize min = NSMakeSize(SF(extra->minw), SF(extra->minh)); #undef SF - [qt_mac_window_for(q) setMinSize:min]; - [qt_mac_window_for(q) setMaxSize:max]; + [qt_mac_window_for(q) setContentMinSize:min]; + [qt_mac_window_for(q) setContentMaxSize:max]; #endif } |