3 files changed, 9 insertions, 12 deletions
diff --git a/src/gui/accessible/qaccessiblecache_mac.mm b/src/gui/accessible/qaccessiblecache_mac.mm
index bc6d0712d6..97c0c7e097 100644
--- a/src/gui/accessible/qaccessiblecache_mac.mm
+++ b/src/gui/accessible/qaccessiblecache_mac.mm
@@ -43,19 +43,19 @@
 
 QT_BEGIN_NAMESPACE
 
-void QAccessibleCache::insertElement(QAccessible::Id axid, QMacAccessibilityElement *element) const
+void QAccessibleCache::insertElement(QAccessible::Id axid, QT_MANGLE_NAMESPACE(QMacAccessibilityElement) *element) const
 {
     cocoaElements[axid] = element;
 }
 
 void QAccessibleCache::removeCocoaElement(QAccessible::Id axid)
 {
-    QMacAccessibilityElement *element = elementForId(axid);
+    QT_MANGLE_NAMESPACE(QMacAccessibilityElement) *element = elementForId(axid);
     [element invalidate];
     cocoaElements.remove(axid);
 }
 
-QMacAccessibilityElement *QAccessibleCache::elementForId(QAccessible::Id axid) const
+QT_MANGLE_NAMESPACE(QMacAccessibilityElement) *QAccessibleCache::elementForId(QAccessible::Id axid) const
 {
     return cocoaElements.value(axid);
 }
diff --git a/src/gui/accessible/qaccessiblecache_p.h b/src/gui/accessible/qaccessiblecache_p.h
index 3ca62709b1..643cbe5667 100644
--- a/src/gui/accessible/qaccessiblecache_p.h
+++ b/src/gui/accessible/qaccessiblecache_p.h
@@ -59,9 +59,7 @@
 
 #include "qaccessible.h"
 
-#ifdef Q_OS_MAC
-    Q_FORWARD_DECLARE_OBJC_CLASS(QMacAccessibilityElement);
-#endif
+Q_FORWARD_DECLARE_OBJC_CLASS(QT_MANGLE_NAMESPACE(QMacAccessibilityElement));
 
 QT_BEGIN_NAMESPACE
 
@@ -76,8 +74,8 @@ public:
     void deleteInterface(QAccessible::Id id, QObject *obj = 0);
 
 #ifdef Q_OS_MAC
-    QMacAccessibilityElement *elementForId(QAccessible::Id axid) const;
-    void insertElement(QAccessible::Id axid, QMacAccessibilityElement *element) const;
+    QT_MANGLE_NAMESPACE(QMacAccessibilityElement) *elementForId(QAccessible::Id axid) const;
+    void insertElement(QAccessible::Id axid, QT_MANGLE_NAMESPACE(QMacAccessibilityElement) *element) const;
 #endif
 
 private Q_SLOTS:
@@ -91,7 +89,7 @@ private:
 
 #ifdef Q_OS_MAC
     void removeCocoaElement(QAccessible::Id axid);
-    mutable QHash<QAccessible::Id, QMacAccessibilityElement *> cocoaElements;
+    mutable QHash<QAccessible::Id, QT_MANGLE_NAMESPACE(QMacAccessibilityElement) *> cocoaElements;
 #endif
 
     friend class QAccessible;
diff --git a/src/gui/opengl/qopengltexture.cpp b/src/gui/opengl/qopengltexture.cpp
index b64956c65c..06a71af552 100644
--- a/src/gui/opengl/qopengltexture.cpp
+++ b/src/gui/opengl/qopengltexture.cpp
@@ -2812,9 +2812,8 @@ bool QOpenGLTexture::hasFeature(Feature feature)
             break;
 
         case TextureBuffer:
-            supported = f.version() >= qMakePair(4, 3)
-                    || (ctx->hasExtension(QByteArrayLiteral("GL_ARB_texture_buffer_object"))
-                        && ctx->hasExtension(QByteArrayLiteral("GL_ARB_texture_buffer_range")));
+            supported = f.version() >= qMakePair(3, 0)
+                    || ctx->hasExtension(QByteArrayLiteral("GL_ARB_texture_buffer_object"));
             break;
 
         case StencilTexturing: