diff options
| author | Morten Sorvig <morten.sorvig@nokia.com> | 2011-09-29 14:29:05 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2011-10-10 07:47:58 +0200 |
| commit | 9fa6e8f627d0c61fd5a3b993903a362dc04bf707 (patch) | |
| tree | 56858ef0994ef4b300d5f6928fa51b0844bf1861 /src/widgets/widgets/qmaccocoaviewcontainer_mac.mm | |
| parent | 33233ca3e3d79152744eedd353106c5d95737e00 (diff) | |
Clean-up a macro for Cocoa
Remove the usage of Q_MAC_USE_COCOA and Carbon code paths.
Change-Id: Ib569ad8c6d9ffe258f454b3c3b06e95294a10112
Reviewed-on: http://codereview.qt-project.org/5100
Reviewed-by: Morten Johan Sørvig <morten.sorvig@nokia.com>
Sanity-Review: Morten Johan Sørvig <morten.sorvig@nokia.com>
Diffstat (limited to 'src/widgets/widgets/qmaccocoaviewcontainer_mac.mm')
| -rw-r--r-- | src/widgets/widgets/qmaccocoaviewcontainer_mac.mm | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/src/widgets/widgets/qmaccocoaviewcontainer_mac.mm b/src/widgets/widgets/qmaccocoaviewcontainer_mac.mm index 8e64e3bbe0..b79ee3d4e0 100644 --- a/src/widgets/widgets/qmaccocoaviewcontainer_mac.mm +++ b/src/widgets/widgets/qmaccocoaviewcontainer_mac.mm @@ -96,28 +96,18 @@ class QMacCocoaViewContainerPrivate : public QWidgetPrivate Q_DECLARE_PUBLIC(QMacCocoaViewContainer) public: NSView *nsview; -#ifndef QT_MAC_USE_COCOA - HIViewRef wrapperView; -#endif QMacCocoaViewContainerPrivate(); ~QMacCocoaViewContainerPrivate(); }; QMacCocoaViewContainerPrivate::QMacCocoaViewContainerPrivate() : nsview(0) -#ifndef QT_MAC_USE_COCOA - , wrapperView(0) -#endif { } QMacCocoaViewContainerPrivate::~QMacCocoaViewContainerPrivate() { [nsview release]; -#ifndef QT_MAC_USE_COCOA - if (wrapperView) - CFRelease(wrapperView); -#endif } /*! @@ -168,20 +158,7 @@ void QMacCocoaViewContainer::setCocoaView(void *cocoaViewToWrap) destroy(true, true); [view retain]; d->nsview = view; -#ifndef QT_MAC_USE_COCOA - if (QSysInfo::MacintoshVersion < QSysInfo::MV_10_5) { - qWarning("QMacCocoaViewContainer::setCocoaView: You cannot use this class with Carbon on versions of Mac OS X less than 10.5."); - return; - } -#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5 - if (d->wrapperView) - CFRelease(d->wrapperView); - HICocoaViewCreate(d->nsview, 0, &d->wrapperView); - create(WId(d->wrapperView), false, true); -#endif -#else create(WId(d->nsview), false, true); -#endif [oldView release]; } |