From 2270895d7bf0d9908500b7da5e5948a86074e0d2 Mon Sep 17 00:00:00 2001
From: Jerome Leclanche <adys.wh@gmail.com>
Date: Thu, 29 Mar 2012 12:23:33 +0100
Subject: [PATCH] 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>
---
src/plugins/plugins.pro | 4 +++-
src/quick/items/qquickcanvas.cpp | 2 ++
src/quick/items/qquickcanvas.h | 2 ++
3 files changed, 7 insertions(+), 1 deletion(-)
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;
--
GitLab