From 746f15d0c213fef0e46207682815bd839a36ecc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tor=20Arne=20Vestb=C3=B8?= Date: Fri, 6 Jul 2018 19:46:13 +0200 Subject: [PATCH] macOS: Remove dead accessibility debug code in QNSView MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I00d7f59576d8315f47ea70404460a6e2d133dd1f Reviewed-by: Morten Johan Sørvig --- src/plugins/platforms/cocoa/cocoa.pro | 5 ----- src/plugins/platforms/cocoa/qnsview.mm | 19 ------------------- 2 files changed, 24 deletions(-) diff --git a/src/plugins/platforms/cocoa/cocoa.pro b/src/plugins/platforms/cocoa/cocoa.pro index 9f76b3f1e9e..8d65cf328f7 100644 --- a/src/plugins/platforms/cocoa/cocoa.pro +++ b/src/plugins/platforms/cocoa/cocoa.pro @@ -127,11 +127,6 @@ qtHaveModule(widgets) { OTHER_FILES += cocoa.json -# Acccessibility debug support -# DEFINES += QT_COCOA_ENABLE_ACCESSIBILITY_INSPECTOR -# include ($$PWD/../../../../util/accessibilityinspector/accessibilityinspector.pri) - - PLUGIN_TYPE = platforms PLUGIN_CLASS_NAME = QCocoaIntegrationPlugin !equals(TARGET, $$QT_DEFAULT_QPA_PLUGIN): PLUGIN_EXTENDS = - diff --git a/src/plugins/platforms/cocoa/qnsview.mm b/src/plugins/platforms/cocoa/qnsview.mm index 2cbfd7a406f..c89281c1a46 100644 --- a/src/plugins/platforms/cocoa/qnsview.mm +++ b/src/plugins/platforms/cocoa/qnsview.mm @@ -65,10 +65,6 @@ #endif #include "qcocoaintegration.h" -#ifdef QT_COCOA_ENABLE_ACCESSIBILITY_INSPECTOR -#include -#endif - // Private interface @interface QT_MANGLE_NAMESPACE(QNSView) () - (BOOL)isTransparentForUserInput; @@ -179,21 +175,6 @@ // See also QCocoaGLContext::makeCurrent for software renderer workarounds. } -#ifdef QT_COCOA_ENABLE_ACCESSIBILITY_INSPECTOR - // prevent rift in space-time continuum, disable - // accessibility for the accessibility inspector's windows. - static bool skipAccessibilityForInspectorWindows = false; - if (!skipAccessibilityForInspectorWindows) { - - // m_accessibleRoot = window->accessibleRoot(); - - AccessibilityInspector *inspector = new AccessibilityInspector(window); - skipAccessibilityForInspectorWindows = true; - inspector->inspectWindow(window); - skipAccessibilityForInspectorWindows = false; - } -#endif - [self registerDragTypes]; [[NSNotificationCenter defaultCenter] addObserver:self