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>

diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index ae42ba1..9ef8c7a 100644 (file)
--- 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 5a57a90..5d4293a 100644 (file)
--- 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 787bb7e..396bc2b 100644 (file)
--- 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;