From: Marcus Comstedt <redacted>
Date: Wed, 30 Sep 2015 18:20:46 +0000 (+0200)
Subject: android: Don't include qtaccessiblewidgets plugin
X-Git-Tag: pulseview-0.3.0~106
X-Git-Url: https://sigrok.org/gitweb/?p=pulseview.git;a=commitdiff_plain;h=e482fa6ce81abb814fdfb3a78bb3e6c77e0185d9

android: Don't include qtaccessiblewidgets plugin

Since Qt 5.4.0, accessibility is no longer a plugin.
---

diff --git a/android/custom_rules.xml b/android/custom_rules.xml
index 73c769d1..2f16199b 100644
--- a/android/custom_rules.xml
+++ b/android/custom_rules.xml
@@ -69,7 +69,6 @@
 				<include name="generic/libqevdevtouchplugin.so"/>
 				<include name="imageformats/libqsvg.so"/>
 				<include name="iconengines/libqsvgicon.so"/>
-				<include name="accessible/libqtaccessiblewidgets.so"/>
 			</fileset>
 			<filtermapper>
 				<replacestring from="/" to="_" />
diff --git a/android/res/values/libs.xml b/android/res/values/libs.xml
index f9d6aada..4447e9f0 100644
--- a/android/res/values/libs.xml
+++ b/android/res/values/libs.xml
@@ -42,7 +42,6 @@
 		<item>libplugins_generic_libqevdevtouchplugin.so:plugins/generic/libqevdevtouchplugin.so</item>
 		<item>libplugins_imageformats_libqsvg.so:plugins/imageformats/libqsvg.so</item>
 		<item>libplugins_iconengines_libqsvgicon.so:plugins/iconengines/libqsvgicon.so</item>
-		<item>libplugins_accessible_libqtaccessiblewidgets.so:plugins/accessible/libqtaccessiblewidgets.so</item>
 	</array>
 	<array name="bundled_in_assets">
 		<!-- %%INSERT_BUNDLED_IN_ASSETS%% -->