diff options
| author | Jerome Leclanche <adys.wh@gmail.com> | 2012-03-29 12:23:33 +0100 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-03-29 13:39:28 +0200 |
| commit | 2270895d7bf0d9908500b7da5e5948a86074e0d2 (patch) | |
| tree | 045d1273e5ef95acda9bfaa51b1e5b1a921c9be2 | |
| parent | e5595f3dc1e96de91066fd0e044b102a845d1fb1 (diff) | |
Fix compiling qtdeclarative without accessibility
This adds two missing QT_NO_DECLARATIVE and conditionally compiles the accessible plugins.
Change-Id: I3ae43b1e38cff0e64fea5cc06146be519ff2713d
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@nokia.com>
| -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; |