diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-04 19:29:48 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-01-04 19:29:48 (GMT) |
| commit | 84b5bbc77045cdc267626ff86f309664283abed4 (patch) | |
| tree | 7624ed8ea191149152c31b70815599126419fc6a /src | |
| parent | 64f05e5de1386d8d00b275c0ffda4a92518d2ee3 (diff) | |
| parent | 7008c516cda01a24d034a1d44dfaab03be4bfdb9 (diff) | |
| download | Qt-84b5bbc77045cdc267626ff86f309664283abed4.zip Qt-84b5bbc77045cdc267626ff86f309664283abed4.tar.gz Qt-84b5bbc77045cdc267626ff86f309664283abed4.tar.bz2 | |
Merge branch 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into master-integration
* 'master' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Allow QWidget with size larger than 16383 on Mac OS X (Cocoa)
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/kernel/qwidget_mac.mm | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm index 059140e..3c5c458 100644 --- a/src/gui/kernel/qwidget_mac.mm +++ b/src/gui/kernel/qwidget_mac.mm @@ -4224,6 +4224,7 @@ void QWidgetPrivate::setWSGeometry(bool dontShow, const QRect &oldRect) } } +#ifndef QT_MAC_USE_COCOA const QRect validRange(-XCOORD_MAX,-XCOORD_MAX, 2*XCOORD_MAX, 2*XCOORD_MAX); if (!validRange.contains(xrect)) { // we are too big, and must clip @@ -4242,6 +4243,7 @@ void QWidgetPrivate::setWSGeometry(bool dontShow, const QRect &oldRect) wrect = xrect; wrect.translate(-data.crect.topLeft()); // translate wrect in my Qt coordinates } +#endif //QT_MAC_USE_COCOA } // unmap if we are outside the valid window system coord system |