diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-24 23:19:36 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-01-24 23:19:36 (GMT) |
| commit | ae694b0895fa9e462c6146d157a228dd687f8870 (patch) | |
| tree | 3854e3d7fc1b62dfc23930db8409a4b96e5eec05 /src/gui | |
| parent | 4d1c8407c1ac16b6288c3aa0f7c2118d2748f348 (diff) | |
| parent | 9a46748375396ab84cd87baf3bdfe683a2803668 (diff) | |
| download | Qt-ae694b0895fa9e462c6146d157a228dd687f8870.zip Qt-ae694b0895fa9e462c6146d157a228dd687f8870.tar.gz Qt-ae694b0895fa9e462c6146d157a228dd687f8870.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Doc: Fixed broken link.
Doc: Added a warning about the Accelerated Graphics Driver example.
Doc: Fixed installation information for Qt for Embedded Linux.
fix copy-paste error
minor optimization
Autotest: add a test for allowing hostnames ending in dot
Fix QUrl::toAce for domains with dot at end
Fix NSCFNumber autorelease warning on Mac.
Add a reference to adjustSize() from the size property
Fix the parallel build of QtWebKit
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/kernel/qapplication_mac.mm | 4 | ||||
| -rw-r--r-- | src/gui/kernel/qwidget.cpp | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/gui/kernel/qapplication_mac.mm b/src/gui/kernel/qapplication_mac.mm index 6aebef5..847c58d 100644 --- a/src/gui/kernel/qapplication_mac.mm +++ b/src/gui/kernel/qapplication_mac.mm @@ -227,6 +227,10 @@ void onApplicationChangedActivation( bool activated ); static void qt_mac_read_fontsmoothing_settings() { +#ifdef QT_MAC_USE_COCOA + QMacCocoaAutoReleasePool pool2; +#endif + NSInteger appleFontSmoothing = [[NSUserDefaults standardUserDefaults] integerForKey:@"AppleFontSmoothing"]; qt_applefontsmoothing_enabled = (appleFontSmoothing > 0); } diff --git a/src/gui/kernel/qwidget.cpp b/src/gui/kernel/qwidget.cpp index ede87de..ffad38b 100644 --- a/src/gui/kernel/qwidget.cpp +++ b/src/gui/kernel/qwidget.cpp @@ -3352,7 +3352,7 @@ QPoint QWidget::pos() const \note Setting the size to \c{QSize(0, 0)} will cause the widget to not appear on screen. This also applies to windows. - \sa pos, geometry, minimumSize, maximumSize, resizeEvent() + \sa pos, geometry, minimumSize, maximumSize, resizeEvent(), adjustSize() */ /*! |