Commit 5e1e111a authored by Eskil Abrahamsen Blomfeldt's avatar Eskil Abrahamsen Blomfeldt Committed by The Qt Project
Browse files

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: default avatarPaul Olav Tvete <paul.tvete@digia.com>
parent 86249e8a
No related merge requests found
Showing with 4 additions and 1 deletion
...@@ -14,12 +14,15 @@ exists("qqml_enable_gcov") { ...@@ -14,12 +14,15 @@ exists("qqml_enable_gcov") {
QMAKE_DOCS = $$PWD/doc/qtquick.qdocconf QMAKE_DOCS = $$PWD/doc/qtquick.qdocconf
ANDROID_LIB_DEPENDENCIES = \
lib/libQt5QuickParticles.so
ANDROID_LIB_DEPENDENCY_REPLACEMENTS = \ ANDROID_LIB_DEPENDENCY_REPLACEMENTS = \
"plugins/platforms/android/libqtforandroid.so:plugins/platforms/android/libqtforandroidGL.so" "plugins/platforms/android/libqtforandroid.so:plugins/platforms/android/libqtforandroidGL.so"
MODULE_PLUGIN_TYPES = \ MODULE_PLUGIN_TYPES = \
accessible accessible
ANDROID_BUNDLED_FILES += \ ANDROID_BUNDLED_FILES += \
qml qml \
lib/libQt5QuickParticles.so
load(qt_module) load(qt_module)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment