diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2010-03-04 10:09:00 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2010-03-04 10:09:00 (GMT) |
| commit | dead11df75ef6957a56ad83de6020a6c4e87ba16 (patch) | |
| tree | 8b5219cfb9355d82d9b7aecb9b7b6a4baefebe06 /src/gui | |
| parent | 625f6b92a08d8ef2a1e5697fce28ca39d29917fe (diff) | |
| parent | 2cb4b0a528a6d979a3edeb08611a6ac11cb54bd4 (diff) | |
| download | Qt-dead11df75ef6957a56ad83de6020a6c4e87ba16.zip Qt-dead11df75ef6957a56ad83de6020a6c4e87ba16.tar.gz Qt-dead11df75ef6957a56ad83de6020a6c4e87ba16.tar.bz2 | |
Merge remote branch 'origin/4.7' into 4.7
Conflicts:
src/multimedia/qml/qml.pri
Diffstat (limited to 'src/gui')
| -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]; } |