diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-04 03:56:15 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-03-04 03:56:15 (GMT) |
| commit | 2cb4b0a528a6d979a3edeb08611a6ac11cb54bd4 (patch) | |
| tree | 55ebf8f3c738a516c089bffd71e5385b5c730fb7 /src/gui/kernel | |
| parent | 46dbe721c8a9efc555eb4c449141071825f2f747 (diff) | |
| parent | 1cc9c745f09c3399aeccc0f9b8ca07bbbfaf143b (diff) | |
| download | Qt-2cb4b0a528a6d979a3edeb08611a6ac11cb54bd4.zip Qt-2cb4b0a528a6d979a3edeb08611a6ac11cb54bd4.tar.gz Qt-2cb4b0a528a6d979a3edeb08611a6ac11cb54bd4.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging:
Fix namespace qml decleration.
Cocoa namespace fixes.
Namespace fixes.
QT7 mediaservice; Fix memory leak
Undo a doc revert.
Remove dependency on declarative from multimedia.
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qt_cocoa_helpers_mac.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qt_cocoa_helpers_mac.mm b/src/gui/kernel/qt_cocoa_helpers_mac.mm index 9560952..c776b2a 100644 --- a/src/gui/kernel/qt_cocoa_helpers_mac.mm +++ b/src/gui/kernel/qt_cocoa_helpers_mac.mm @@ -373,7 +373,7 @@ QMacTabletHash *qt_mac_tablet_hash() // Clears the QWidget pointer that each QCocoaView holds. void qt_mac_clearCocoaViewQWidgetPointers(QWidget *widget) { - QCocoaView *cocoaView = reinterpret_cast<QCocoaView *>(qt_mac_nativeview_for(widget)); + QT_MANGLE_NAMESPACE(QCocoaView) *cocoaView = reinterpret_cast<QT_MANGLE_NAMESPACE(QCocoaView) *>(qt_mac_nativeview_for(widget)); if (cocoaView && [cocoaView respondsToSelector:@selector(qt_qwidget)]) { [cocoaView qt_clearQWidget]; } |