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 73c769d1c795278006e4d2225a20ce1a0fb692bb..2f16199bd221296c3106b2113a9c72be9c0109dd 100644 (file)
--- 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="generic/libqevdevtouchplugin.so"/>
                                <include name="imageformats/libqsvg.so"/>
                                <include name="iconengines/libqsvgicon.so"/>

-                               <include name="accessible/libqtaccessiblewidgets.so"/>

                        </fileset>
                        <filtermapper>
                                <replacestring from="/" to="_" />
                        </fileset>
                        <filtermapper>
                                <replacestring from="/" to="_" />

diff --git a/android/res/values/libs.xml b/android/res/values/libs.xml
index f9d6aada63df83b7fbd90f0253b4a9fce135c789..4447e9f0f65312ed1535621e7f735f4562f71b83 100644 (file)
--- 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_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%% -->
        </array>
        <array name="bundled_in_assets">
                <!-- %%INSERT_BUNDLED_IN_ASSETS%% -->