diff options
Diffstat (limited to 'src/plugins/platforms/ios')
7 files changed, 7 insertions, 7 deletions
diff --git a/src/plugins/platforms/ios/qiosintegration.h b/src/plugins/platforms/ios/qiosintegration.h index 8720534da82..6830a5b4555 100644 --- a/src/plugins/platforms/ios/qiosintegration.h +++ b/src/plugins/platforms/ios/qiosintegration.h @@ -52,7 +52,7 @@ public: QPlatformNativeInterface *nativeInterface() const override; QPointingDevice *touchDevice(); -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QPlatformAccessibility *accessibility() const override; #endif diff --git a/src/plugins/platforms/ios/qiosintegration.mm b/src/plugins/platforms/ios/qiosintegration.mm index df559a5f335..7d04a84d860 100644 --- a/src/plugins/platforms/ios/qiosintegration.mm +++ b/src/plugins/platforms/ios/qiosintegration.mm @@ -247,7 +247,7 @@ QPointingDevice *QIOSIntegration::touchDevice() return m_touchDevice; } -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QPlatformAccessibility *QIOSIntegration::accessibility() const { if (!m_accessibility) diff --git a/src/plugins/platforms/ios/qiosplatformaccessibility.h b/src/plugins/platforms/ios/qiosplatformaccessibility.h index 6ddc71c2cb1..96efc663bac 100644 --- a/src/plugins/platforms/ios/qiosplatformaccessibility.h +++ b/src/plugins/platforms/ios/qiosplatformaccessibility.h @@ -6,7 +6,7 @@ #include <qpa/qplatformaccessibility.h> -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) QT_BEGIN_NAMESPACE diff --git a/src/plugins/platforms/ios/qiosplatformaccessibility.mm b/src/plugins/platforms/ios/qiosplatformaccessibility.mm index 30313b45362..d54b7db57a3 100644 --- a/src/plugins/platforms/ios/qiosplatformaccessibility.mm +++ b/src/plugins/platforms/ios/qiosplatformaccessibility.mm @@ -3,7 +3,7 @@ #include "qiosplatformaccessibility.h" -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) #include <QtGui/QtGui> #include "qioswindow.h" diff --git a/src/plugins/platforms/ios/quiaccessibilityelement.h b/src/plugins/platforms/ios/quiaccessibilityelement.h index bf67db2246e..e78fef6d309 100644 --- a/src/plugins/platforms/ios/quiaccessibilityelement.h +++ b/src/plugins/platforms/ios/quiaccessibilityelement.h @@ -7,7 +7,7 @@ #import <UIKit/UIKit.h> #import <QtGui/QtGui> -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) @interface QT_MANGLE_NAMESPACE(QMacAccessibilityElement) : UIAccessibilityElement diff --git a/src/plugins/platforms/ios/quiaccessibilityelement.mm b/src/plugins/platforms/ios/quiaccessibilityelement.mm index c1415163a6c..08e366f32bf 100644 --- a/src/plugins/platforms/ios/quiaccessibilityelement.mm +++ b/src/plugins/platforms/ios/quiaccessibilityelement.mm @@ -3,7 +3,7 @@ #include "quiaccessibilityelement.h" -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) #include "private/qaccessiblecache_p.h" #include "private/qcore_mac_p.h" diff --git a/src/plugins/platforms/ios/quiview.mm b/src/plugins/platforms/ios/quiview.mm index 5e1992ee9cd..eac492044cb 100644 --- a/src/plugins/platforms/ios/quiview.mm +++ b/src/plugins/platforms/ios/quiview.mm @@ -722,7 +722,7 @@ Q_LOGGING_CATEGORY(lcQpaTablet, "qt.qpa.input.tablet") @end #endif -#ifndef QT_NO_ACCESSIBILITY +#if QT_CONFIG(accessibility) // Include category as an alternative to using -ObjC (Apple QA1490) #include "quiview_accessibility.mm" #endif |