diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-28 12:54:57 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-28 12:54:57 (GMT) |
| commit | 9c259e69c6ef56e65920186ccb246e8cd9e0acf8 (patch) | |
| tree | 384bd7ada98e8ab362ab19e5c75105375f9fb4ff /src/gui/kernel/qcocoawindowdelegate_mac_p.h | |
| parent | 953e91c582cd396082250748e4c4d8424292c1de (diff) | |
| parent | 68c091c29eb8204a2959858e305b26b850801250 (diff) | |
| download | Qt-9c259e69c6ef56e65920186ccb246e8cd9e0acf8.zip Qt-9c259e69c6ef56e65920186ccb246e8cd9e0acf8.tar.gz Qt-9c259e69c6ef56e65920186ccb246e8cd9e0acf8.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1:
Wrong geometery for QMainWindow with Unified toolbar on Cocoa.
Statically link to Qt based dependent librarys.
Add libgq version 0.4+0m6.
Add libconninet version 0.41+0m6.
Diffstat (limited to 'src/gui/kernel/qcocoawindowdelegate_mac_p.h')
| -rw-r--r-- | src/gui/kernel/qcocoawindowdelegate_mac_p.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/gui/kernel/qcocoawindowdelegate_mac_p.h b/src/gui/kernel/qcocoawindowdelegate_mac_p.h index de9c946..2ca9b13 100644 --- a/src/gui/kernel/qcocoawindowdelegate_mac_p.h +++ b/src/gui/kernel/qcocoawindowdelegate_mac_p.h @@ -105,5 +105,6 @@ QT_FORWARD_DECLARE_CLASS(QWidgetData) - (NSSize)closestAcceptableSizeForWidget:(QWidget *)qwidget window:(NSWindow *)window withNewSize:(NSSize)proposedSize; - (QWidget *)qt_qwidgetForWindow:(NSWindow *)window; +- (void)syncContentViewFrame: (NSNotification *)notification; @end #endif |