Fix -no-accessibility build

WebEngine is built without -DQT_NO_ACCESSIBILITY. qtgui-config.h defines
it but accessibility_activation_observer.h didn't include it if
accessibility was disabled.

Also replace all occurrences of QT_NO_ACCESSIBILITY by
QT_CONFIG(accessibility) in core.

Change-Id: I5e5e14885e04cd542ec9e52d770f7070e8edbf8b
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

11 files changed, 31 insertions, 26 deletions

diff --git a/src/core/accessibility_activation_observer.cpp b/src/core/accessibility_activation_observer.cpp
index 75ad90c54..833190844 100644
--- a/src/core/accessibility_activation_observer.cpp
+++ b/src/core/accessibility_activation_observer.cpp
@@ -39,7 +39,7 @@
 
 #include "accessibility_activation_observer.h"
 
-#ifndef QT_NO_ACCESSIBILITY
+#if QT_CONFIG(accessibility)
 
 #include "content/browser/accessibility/browser_accessibility_state_impl.h"
 
@@ -86,4 +86,4 @@ void AccessibilityActivationObserver::accessibilityActiveChanged(bool active)
 
 } // namespace QtWebEngineCore
 
-#endif  // QT_NO_ACCESSIBILITY
+#endif // QT_CONFIG(accessibility)
diff --git a/src/core/accessibility_activation_observer.h b/src/core/accessibility_activation_observer.h
index e42c83eb5..23fd2101e 100644
--- a/src/core/accessibility_activation_observer.h
+++ b/src/core/accessibility_activation_observer.h
@@ -40,9 +40,10 @@
 #ifndef ACCESSIBILITY_ACTIVATION_OBSERVER_H
 #define ACCESSIBILITY_ACTIVATION_OBSERVER_H
 
-#ifndef QT_NO_ACCESSIBILITY
 #include <QtGui/qaccessible.h>
 
+#if QT_CONFIG(accessibility)
+
 namespace QtWebEngineCore {
 
 class RenderWidgetHostViewQt;
@@ -58,6 +59,6 @@ public:
 
 } // namespace QtWebEngineCore
 
-#endif // QT_NO_ACCESSIBILITY
+#endif // QT_CONFIG(accessibility)
 
 #endif // ACCESSIBILITY_ACTIVATION_OBSERVER_H
diff --git a/src/core/accessibility_tree_formatter_qt.cpp b/src/core/accessibility_tree_formatter_qt.cpp
index 334759abb..081856b37 100644
--- a/src/core/accessibility_tree_formatter_qt.cpp
+++ b/src/core/accessibility_tree_formatter_qt.cpp
@@ -52,7 +52,7 @@
 
 namespace content {
 
-#ifndef QT_NO_ACCESSIBILITY
+#if QT_CONFIG(accessibility)
 class AccessibilityTreeFormatterQt : public AccessibilityTreeFormatterBrowser {
 public:
     explicit AccessibilityTreeFormatterQt();
@@ -204,12 +204,12 @@ const std::string AccessibilityTreeFormatterQt::GetDenyNodeString()
     return "@QT-DENY-NODE:";
 }
 
-#endif // QT_NO_ACCESSIBILITY
+#endif // QT_CONFIG(accessibility)
 
 // static
 std::unique_ptr<AccessibilityTreeFormatter> AccessibilityTreeFormatter::Create()
 {
-#ifndef QT_NO_ACCESSIBILITY
+#if QT_CONFIG(accessibility)
     return std::unique_ptr<AccessibilityTreeFormatter>(new AccessibilityTreeFormatterQt());
 #else
     return nullptr;
diff --git a/src/core/browser_accessibility_manager_qt.cpp b/src/core/browser_accessibility_manager_qt.cpp
index 8e3ee5940..5968bfd30 100644
--- a/src/core/browser_accessibility_manager_qt.cpp
+++ b/src/core/browser_accessibility_manager_qt.cpp
@@ -51,24 +51,24 @@ BrowserAccessibilityManager* BrowserAccessibilityManager::Create(
       BrowserAccessibilityDelegate* delegate,
       BrowserAccessibilityFactory* factory)
 {
-#ifndef QT_NO_ACCESSIBILITY
+#if QT_CONFIG(accessibility)
     return new BrowserAccessibilityManagerQt(nullptr, initialTree, delegate, factory);
 #else
     delete factory;
     return nullptr;
-#endif // QT_NO_ACCESSIBILITY
+#endif // QT_CONFIG(accessibility)
 }
 
 BrowserAccessibility *BrowserAccessibility::Create()
 {
-#ifndef QT_NO_ACCESSIBILITY
+#if QT_CONFIG(accessibility)
     return new BrowserAccessibilityQt();
 #else
     return nullptr;
-#endif // QT_NO_ACCESSIBILITY
+#endif // QT_CONFIG(accessibility)
 }
 
-#ifndef QT_NO_ACCESSIBILITY
+#if QT_CONFIG(accessibility)
 BrowserAccessibilityManagerQt::BrowserAccessibilityManagerQt(
     QObject *parentObject, const ui::AXTreeUpdate &initialTree,
     BrowserAccessibilityDelegate* delegate, BrowserAccessibilityFactory* factory)
@@ -164,6 +164,6 @@ void BrowserAccessibilityManagerQt::FireGeneratedEvent(ui::AXEventGenerator::Eve
     }
 }
 
-#endif // QT_NO_ACCESSIBILITY
+#endif // QT_CONFIG(accessibility)
 
 }
diff --git a/src/core/browser_accessibility_manager_qt.h b/src/core/browser_accessibility_manager_qt.h
index 16e2d1fe7..6d6086811 100644
--- a/src/core/browser_accessibility_manager_qt.h
+++ b/src/core/browser_accessibility_manager_qt.h
@@ -41,8 +41,11 @@
 #define BROWSER_ACCESSIBILITY_MANAGER_QT_H
 
 #include "content/browser/accessibility/browser_accessibility_manager.h"
-#ifndef QT_NO_ACCESSIBILITY
+
 #include <QtCore/qobject.h>
+#include <QtGui/qtgui-config.h>
+
+#if QT_CONFIG(accessibility)
 
 QT_BEGIN_NAMESPACE
 class QAccessibleInterface;
@@ -74,5 +77,5 @@ private:
 
 }
 
-#endif // QT_NO_ACCESSIBILITY
+#endif // QT_CONFIG(accessibility)
 #endif
diff --git a/src/core/browser_accessibility_qt.cpp b/src/core/browser_accessibility_qt.cpp
index 6104fb1f8..de78eb85d 100644
--- a/src/core/browser_accessibility_qt.cpp
+++ b/src/core/browser_accessibility_qt.cpp
@@ -43,7 +43,7 @@
 
 #include "browser_accessibility_qt.h"
 
-#ifndef QT_NO_ACCESSIBILITY
+#if QT_CONFIG(accessibility)
 
 #include "ui/accessibility/ax_enums.mojom.h"
 
@@ -996,4 +996,4 @@ void BrowserAccessibilityQt::modelChange(QAccessibleTableModelChangeEvent *)
 
 } // namespace content
 
-#endif // QT_NO_ACCESSIBILITY
+#endif // QT_CONFIG(accessibility)
diff --git a/src/core/browser_accessibility_qt.h b/src/core/browser_accessibility_qt.h
index 4acac6aa7..19c7a1e54 100644
--- a/src/core/browser_accessibility_qt.h
+++ b/src/core/browser_accessibility_qt.h
@@ -43,7 +43,7 @@
 #include <QtGui/qaccessible.h>
 #include "content/browser/accessibility/browser_accessibility.h"
 
-#ifndef QT_NO_ACCESSIBILITY
+#if QT_CONFIG(accessibility)
 
 namespace content {
 
@@ -151,5 +151,5 @@ QAccessibleInterface *toQAccessibleInterface(BrowserAccessibility *acc);
 
 } // namespace content
 
-#endif // QT_NO_ACCESSIBILITY
+#endif // QT_CONFIG(accessibility)
 #endif
diff --git a/src/core/render_widget_host_view_qt.cpp b/src/core/render_widget_host_view_qt.cpp
index 5887b356e..c99c560a3 100644
--- a/src/core/render_widget_host_view_qt.cpp
+++ b/src/core/render_widget_host_view_qt.cpp
@@ -425,14 +425,14 @@ gfx::NativeViewAccessible RenderWidgetHostViewQt::GetNativeViewAccessible()
 content::BrowserAccessibilityManager* RenderWidgetHostViewQt::CreateBrowserAccessibilityManager(content::BrowserAccessibilityDelegate* delegate, bool for_root_frame)
 {
     Q_UNUSED(for_root_frame); // FIXME
-#ifndef QT_NO_ACCESSIBILITY
+#if QT_CONFIG(accessibility)
     return new content::BrowserAccessibilityManagerQt(
         m_adapterClient->accessibilityParentObject(),
         content::BrowserAccessibilityManagerQt::GetEmptyDocument(),
         delegate);
 #else
     return 0;
-#endif // QT_NO_ACCESSIBILITY
+#endif // QT_CONFIG(accessibility)
 }
 
 // Set focus to the associated View component.
diff --git a/src/core/web_contents_adapter.cpp b/src/core/web_contents_adapter.cpp
index 2d559bb38..c8bb10fd6 100644
--- a/src/core/web_contents_adapter.cpp
+++ b/src/core/web_contents_adapter.cpp
@@ -1024,7 +1024,7 @@ QWebEngineUrlRequestInterceptor* WebContentsAdapter::requestInterceptor() const
     return m_requestInterceptor;
 }
 
-#ifndef QT_NO_ACCESSIBILITY
+#if QT_CONFIG(accessibility)
 QAccessibleInterface *WebContentsAdapter::browserAccessible()
 {
     CHECK_INITIALIZED(nullptr);
@@ -1040,7 +1040,7 @@ QAccessibleInterface *WebContentsAdapter::browserAccessible()
 
     return content::toQAccessibleInterface(acc);
 }
-#endif // QT_NO_ACCESSIBILITY
+#endif // QT_CONFIG(accessibility)
 
 void WebContentsAdapter::runJavaScript(const QString &javaScript, quint32 worldId)
 {
diff --git a/src/core/web_engine_context.cpp b/src/core/web_engine_context.cpp
index 17742e1d7..56ec4b90a 100644
--- a/src/core/web_engine_context.cpp
+++ b/src/core/web_engine_context.cpp
@@ -106,7 +106,7 @@
 #include "base/mac/foundation_util.h"
 #endif
 
-#ifndef QT_NO_ACCESSIBILITY
+#if QT_CONFIG(accessibility)
 #include "accessibility_activation_observer.h"
 #endif
 #include "api/qwebengineurlscheme.h"
@@ -796,7 +796,7 @@ WebEngineContext::WebEngineContext()
     m_printJobManager.reset(new printing::PrintJobManager());
 #endif
 
-#ifndef QT_NO_ACCESSIBILITY
+#if QT_CONFIG(accessibility)
     m_accessibilityActivationObserver.reset(new AccessibilityActivationObserver());
 #endif
 
diff --git a/src/core/web_engine_context.h b/src/core/web_engine_context.h
index ac0536596..6cbd5c8e5 100644
--- a/src/core/web_engine_context.h
+++ b/src/core/web_engine_context.h
@@ -46,6 +46,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/values.h"
 
+#include <QtGui/qtgui-config.h>
 #include <QVector>
 
 namespace base {
@@ -142,7 +143,7 @@ private:
     std::unique_ptr<ProfileAdapter> m_defaultProfileAdapter;
     std::unique_ptr<DevToolsServerQt> m_devtoolsServer;
     QVector<ProfileAdapter*> m_profileAdapters;
-#ifndef QT_NO_ACCESSIBILITY
+#if QT_CONFIG(accessibility)
     std::unique_ptr<AccessibilityActivationObserver> m_accessibilityActivationObserver;
 #endif