From: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Date: Thu, 2 May 2013 10:46:51 +0000 (+0200)
Subject: Make sure correct files are bundled on Android
X-Git-Tag: upstream/5.2.1~798^2~83
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9cd18091402bfa9a1c190a882f60297f2b1ade11;p=platform%2Fupstream%2Fqtdeclarative.git

Make sure correct files are bundled on Android

When we're bundling Qt inside the apk, we need to know
which extra files to bundle which might be dependencies
of the app. In this case, qml/ which contains the imports
for Qt Quick 2, and the accessible/ plugins.

Change-Id: I0782a6146a4d41d895db20d912eb6877e54ef6c8
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
---

diff --git a/src/quick/quick.pro b/src/quick/quick.pro
index eedc71d..919c9b0 100644
--- a/src/quick/quick.pro
+++ b/src/quick/quick.pro
@@ -16,6 +16,10 @@ QMAKE_DOCS = $$PWD/doc/qtquick.qdocconf
 
 ANDROID_LIB_DEPENDENCY_REPLACEMENTS = \
     "plugins/platforms/android/libqtforandroid.so:plugins/platforms/android/libqtforandroidGL.so"
+MODULE_PLUGIN_TYPES = \
+    accessible
+ANDROID_BUNDLED_FILES += \
+    qml
 
 load(qt_module)