Commit d215a82a authored by Florent Revest's avatar Florent Revest

qtwayland: fix build with --no-accessibility

parent aae98390
From 3bcfbed3ee7db06765dcf794f538333c4c33c4c5 Mon Sep 17 00:00:00 2001
From: Florent Revest <revestflo@gmail.com>
Date: Mon, 12 Sep 2016 22:50:16 +0200
Subject: [PATCH] Fix build with no-accessibility
---
src/client/qwaylandintegration.cpp | 2 ++
src/client/qwaylandintegration_p.h | 3 +++
2 files changed, 5 insertions(+)
diff --git a/src/client/qwaylandintegration.cpp b/src/client/qwaylandintegration.cpp
index 39fff53..b9bc4ad 100644
--- a/src/client/qwaylandintegration.cpp
+++ b/src/client/qwaylandintegration.cpp
@@ -243,10 +243,12 @@ QVariant QWaylandIntegration::styleHint(StyleHint hint) const
return QPlatformIntegration::styleHint(hint);
}
+#ifndef QT_NO_ACCESSIBILITY
QPlatformAccessibility *QWaylandIntegration::accessibility() const
{
return mAccessibility;
}
+#endif
QPlatformServices *QWaylandIntegration::services() const
{
diff --git a/src/client/qwaylandintegration_p.h b/src/client/qwaylandintegration_p.h
index 987d805..18a343b 100644
--- a/src/client/qwaylandintegration_p.h
+++ b/src/client/qwaylandintegration_p.h
@@ -46,6 +46,7 @@
//
#include <qpa/qplatformintegration.h>
+#include <qpa/qplatformaccessibility.h>
#include <QtWaylandClient/private/qwaylandclientexport_p.h>
QT_BEGIN_NAMESPACE
@@ -88,7 +89,9 @@ public:
QVariant styleHint(StyleHint hint) const Q_DECL_OVERRIDE;
+#ifndef QT_NO_ACCESSIBILITY
QPlatformAccessibility *accessibility() const Q_DECL_OVERRIDE;
+#endif
QPlatformServices *services() const Q_DECL_OVERRIDE;
--
2.9.3
FILESEXTRAPATHS_prepend := "${THISDIR}/qtwayland:" FILESEXTRAPATHS_prepend := "${THISDIR}/qtwayland:"
SRC_URI += " file://0001-Forces-GLES2-the-dirty-way.patch \ SRC_URI += " file://0001-Forces-GLES2-the-dirty-way.patch \
file://0001-Revert-Support-EGLStream-in-wayland-egl.patch " file://0002-Revert-Support-EGLStream-in-wayland-egl.patch \
file://0003-Fix-build-with-no-accessibility.patch"
DEPENDS_remove = "${XKB_DEPENDS}"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment