From: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Date: Tue, 14 May 2013 09:35:02 +0000 (+0200)
Subject: Android: Make Qt5QuickParticles a dependency of Qt Quick
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=5e1e111af3675dc1fae626c22ca51f295bf27a08;p=konrad%2Fqtdeclarative.git

Android: Make Qt5QuickParticles a dependency of Qt Quick

Since we don't have any way of parsing QML to find out which
imports will be used, we need to always load Qt5QuickParticles
library when using Qt Quick, since this is a dependency of the
particles import itself. Otherwise, apps that use particles
would crash.

Task-number: QTBUG-30848
Change-Id: I24326e2d59fc05f7867233fe503b2708d50eee78
Reviewed-by: Paul Olav Tvete <paul.tvete@digia.com>
---

diff --git a/src/quick/quick.pro b/src/quick/quick.pro
index 919c9b0..6a2054a 100644
--- a/src/quick/quick.pro
+++ b/src/quick/quick.pro
@@ -14,12 +14,15 @@ exists("qqml_enable_gcov") {
 
 QMAKE_DOCS = $$PWD/doc/qtquick.qdocconf
 
+ANDROID_LIB_DEPENDENCIES = \
+    lib/libQt5QuickParticles.so
 ANDROID_LIB_DEPENDENCY_REPLACEMENTS = \
     "plugins/platforms/android/libqtforandroid.so:plugins/platforms/android/libqtforandroidGL.so"
 MODULE_PLUGIN_TYPES = \
     accessible
 ANDROID_BUNDLED_FILES += \
-    qml
+    qml \
+    lib/libQt5QuickParticles.so
 
 load(qt_module)