From 92666ff5218491671ec97fdd5d7405566d110a2b Mon Sep 17 00:00:00 2001
From: Andre de la Rocha <andre.rocha@qt.io>
Date: Tue, 26 Jun 2018 18:01:55 +0200
Subject: Fix minor stuff in Windows UI Automation support

Adding missing "override" keywords in overridden interfaces, using
"#if QT_CONFIG(accessibility)" instead of "#ifndef QT_NO_ACCESSIBILITY",
and other minor bits. No change in behavior expected.

Change-Id: Ief0e23cb7b577dd3e4af21750b6beccc80d6a2f8
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
---
 .../platforms/windows/uiautomation/qwindowsuiainvokeprovider.h    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src/plugins/platforms/windows/uiautomation/qwindowsuiainvokeprovider.h')

diff --git a/src/plugins/platforms/windows/uiautomation/qwindowsuiainvokeprovider.h b/src/plugins/platforms/windows/uiautomation/qwindowsuiainvokeprovider.h
index fef2513175..5fb509c5f3 100644
--- a/src/plugins/platforms/windows/uiautomation/qwindowsuiainvokeprovider.h
+++ b/src/plugins/platforms/windows/uiautomation/qwindowsuiainvokeprovider.h
@@ -40,8 +40,8 @@
 #ifndef QWINDOWSUIAINVOKEPROVIDER_H
 #define QWINDOWSUIAINVOKEPROVIDER_H
 
-#include <QtCore/qconfig.h>
-#ifndef QT_NO_ACCESSIBILITY
+#include <QtGui/qtguiglobal.h>
+#if QT_CONFIG(accessibility)
 
 #include "qwindowsuiabaseprovider.h"
 
@@ -57,11 +57,11 @@ public:
     virtual ~QWindowsUiaInvokeProvider();
 
     // IInvokeProvider
-    HRESULT STDMETHODCALLTYPE Invoke();
+    HRESULT STDMETHODCALLTYPE Invoke() override;
 };
 
 QT_END_NAMESPACE
 
-#endif // QT_NO_ACCESSIBILITY
+#endif // QT_CONFIG(accessibility)
 
 #endif // QWINDOWSUIAINVOKEPROVIDER_H
-- 
cgit v1.2.3