diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-09-07 09:37:21 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-09-07 09:37:21 (GMT) |
| commit | 75ff3f73544653f6828ac979a381f48e055cc3ad (patch) | |
| tree | b88463673e7f928fb32390d63d3a798099a16ef8 /src/gui/kernel | |
| parent | 4c964245ba0b41225de01d2dfdff518070bb76b2 (diff) | |
| parent | 0f9b98736ceedebece6c9cd4ce2e669300f882c7 (diff) | |
| download | Qt-75ff3f73544653f6828ac979a381f48e055cc3ad.zip Qt-75ff3f73544653f6828ac979a381f48e055cc3ad.tar.gz Qt-75ff3f73544653f6828ac979a381f48e055cc3ad.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:
fix build for desktop
Fix the build with -qtnamespace configure options
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qwidget_mac.mm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/kernel/qwidget_mac.mm b/src/gui/kernel/qwidget_mac.mm index a51e295..632df78 100644 --- a/src/gui/kernel/qwidget_mac.mm +++ b/src/gui/kernel/qwidget_mac.mm @@ -5031,7 +5031,7 @@ void QWidgetPrivate::registerTouchWindow(bool enable) if (enable == touchEventsEnabled) return; - QCocoaView *view = static_cast<QCocoaView *>(qt_mac_effectiveview_for(q)); + QT_MANGLE_NAMESPACE(QCocoaView) *view = static_cast<QT_MANGLE_NAMESPACE(QCocoaView) *>(qt_mac_effectiveview_for(q)); if (!view) return; |