Fix qtwayland build with QT_NO_ACCESSIBILITY
authorLaszlo Agocs <laszlo.p.agocs@nokia.com>
Thu, 16 Aug 2012 12:51:59 +0000 (15:51 +0300)
committerJørgen Lind <jorgen.lind@nokia.com>
Fri, 17 Aug 2012 07:07:18 +0000 (09:07 +0200)
Change-Id: Ib5fea95a37d2e4309e68e04320ba6ad097128a66
Reviewed-by: Jørgen Lind <jorgen.lind@nokia.com>
src/plugins/platforms/wayland/qwaylandintegration.cpp

index 9606f7c..e614a9b 100644 (file)
@@ -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;
 }