From 5e1e111af3675dc1fae626c22ca51f295bf27a08 Mon Sep 17 00:00:00 2001 From: Eskil Abrahamsen Blomfeldt Date: Tue, 14 May 2013 11:35:02 +0200 Subject: [PATCH] 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 --- src/quick/quick.pro | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) 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) -- 1.7.2.5