summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLaszlo Agocs <laszlo.p.agocs@nokia.com>2012-08-16 15:51:59 +0300
committerJørgen Lind <jorgen.lind@nokia.com>2012-08-17 09:07:18 +0200
commitbd28cd9a9e0f9733bd5bf358466e5e0ed0a05495 (patch)
tree6ce3a86035837141c52041ef475c7875d7a84db3
parent313bb6652267a976ac66fbc11a2bdbb1d1ff5b3e (diff)
Fix qtwayland build with QT_NO_ACCESSIBILITY
Change-Id: Ib5fea95a37d2e4309e68e04320ba6ad097128a66 Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
-rw-r--r--src/plugins/platforms/wayland/qwaylandintegration.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/plugins/platforms/wayland/qwaylandintegration.cpp b/src/plugins/platforms/wayland/qwaylandintegration.cpp
index 9606f7c84..e614a9be9 100644
--- a/src/plugins/platforms/wayland/qwaylandintegration.cpp
+++ b/src/plugins/platforms/wayland/qwaylandintegration.cpp
@@ -75,7 +75,11 @@ QWaylandIntegration::QWaylandIntegration()
: mFontDb(new QGenericUnixFontDatabase())
, mEventDispatcher(createUnixEventDispatcher())
, mNativeInterface(new QWaylandNativeInterface(this))
+#ifndef QT_NO_ACCESSIBILITY
, mAccessibility(new QPlatformAccessibility())
+#else
+ , mAccessibility(0)
+#endif
{
QGuiApplicationPrivate::instance()->setEventDispatcher(mEventDispatcher);
mDisplay = new QWaylandDisplay();
@@ -92,7 +96,9 @@ QWaylandIntegration::~QWaylandIntegration()
{
delete mDrag;
delete mClipboard;
+#ifndef QT_NO_ACCESSIBILITY
delete mAccessibility;
+#endif
delete mNativeInterface;
delete mDisplay;
}