From bd28cd9a9e0f9733bd5bf358466e5e0ed0a05495 Mon Sep 17 00:00:00 2001 From: Laszlo Agocs Date: Thu, 16 Aug 2012 15:51:59 +0300 Subject: [PATCH] Fix qtwayland build with QT_NO_ACCESSIBILITY MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Change-Id: Ib5fea95a37d2e4309e68e04320ba6ad097128a66 Reviewed-by: Jørgen Lind --- src/plugins/platforms/wayland/qwaylandintegration.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/plugins/platforms/wayland/qwaylandintegration.cpp b/src/plugins/platforms/wayland/qwaylandintegration.cpp index 9606f7c..e614a9b 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; } -- 2.7.4