diff options
-rw-r--r-- | src/plugins/plugins.pro | 4 | ||||
-rw-r--r-- | src/quick/items/qquickcanvas.cpp | 2 | ||||
-rw-r--r-- | src/quick/items/qquickcanvas.h | 2 |
3 files changed, 7 insertions, 1 deletions
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro index ae42ba1ba4..9ef8c7ab72 100644 --- a/src/plugins/plugins.pro +++ b/src/plugins/plugins.pro @@ -1,3 +1,5 @@ TEMPLATE = subdirs SUBDIRS += qmltooling -SUBDIRS += accessible +contains(QT_CONFIG, accessibility) { + SUBDIRS += accessible +} diff --git a/src/quick/items/qquickcanvas.cpp b/src/quick/items/qquickcanvas.cpp index 5a57a908b9..5d4293a262 100644 --- a/src/quick/items/qquickcanvas.cpp +++ b/src/quick/items/qquickcanvas.cpp @@ -122,10 +122,12 @@ private: bool m_eventSent; }; +#ifndef QT_NO_ACCESSIBILITY QAccessibleInterface *QQuickCanvas::accessibleRoot() const { return QAccessible::queryAccessibleInterface(const_cast<QQuickCanvas*>(this)); } +#endif /* diff --git a/src/quick/items/qquickcanvas.h b/src/quick/items/qquickcanvas.h index 787bb7e3c7..396bc2b8ff 100644 --- a/src/quick/items/qquickcanvas.h +++ b/src/quick/items/qquickcanvas.h @@ -102,7 +102,9 @@ public: QQmlIncubationController *incubationController() const; +#ifndef QT_NO_ACCESSIBILITY virtual QAccessibleInterface *accessibleRoot() const; +#endif // Scene graph specific functions QSGTexture *createTextureFromImage(const QImage &image) const; |