From 4f155b0535c69b895d044bbbbf9535a21dd57994 Mon Sep 17 00:00:00 2001 From: Tim Blechmann Date: Sun, 1 Jun 2014 14:35:04 +0200 Subject: Cocoa: Fix Qt-in-namespace build. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Wrap cocoa classes in namespace macros. Task-number: QTBUG-39382 Change-Id: Id840e666105afca21760fcb529b5765e0a534120 Reviewed-by: Morten Johan Sørvig --- src/gui/accessible/qaccessiblecache_p.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/gui/accessible/qaccessiblecache_p.h') diff --git a/src/gui/accessible/qaccessiblecache_p.h b/src/gui/accessible/qaccessiblecache_p.h index 30b023cfbd..933c6f7313 100644 --- a/src/gui/accessible/qaccessiblecache_p.h +++ b/src/gui/accessible/qaccessiblecache_p.h @@ -59,7 +59,7 @@ #include "qaccessible.h" -Q_FORWARD_DECLARE_OBJC_CLASS(QCocoaAccessibleElement); +Q_FORWARD_DECLARE_OBJC_CLASS(QT_MANGLE_NAMESPACE(QCocoaAccessibleElement)); QT_BEGIN_NAMESPACE @@ -74,8 +74,8 @@ public: void deleteInterface(QAccessible::Id id, QObject *obj = 0); #ifdef Q_OS_OSX - QCocoaAccessibleElement *elementForId(QAccessible::Id axid) const; - void insertElement(QAccessible::Id axid, QCocoaAccessibleElement *element) const; + QT_MANGLE_NAMESPACE(QCocoaAccessibleElement) *elementForId(QAccessible::Id axid) const; + void insertElement(QAccessible::Id axid, QT_MANGLE_NAMESPACE(QCocoaAccessibleElement) *element) const; #endif private Q_SLOTS: @@ -89,7 +89,7 @@ private: #ifdef Q_OS_OSX void removeCocoaElement(QAccessible::Id axid); - mutable QHash cocoaElements; + mutable QHash cocoaElements; #endif friend class QAccessible; -- cgit v1.2.3