File tree Expand file tree Collapse file tree 2 files changed +6
-2
lines changed Expand file tree Collapse file tree 2 files changed +6
-2
lines changed Original file line number Diff line number Diff line change @@ -354,7 +354,6 @@ android {
354354 plugins/imageformats/libqgif.so \
355355 plugins/imageformats/libqicns.so \
356356 plugins/imageformats/libqico.so \
357- plugins/imageformats/libqjp2.so \
358357 plugins/imageformats/libqjpeg.so \
359358 plugins/imageformats/libqtiff.so \
360359 plugins/imageformats/libqwebp.so \
@@ -368,6 +367,9 @@ android {
368367 jar/QtPositioning-bundled.jar \
369368 plugins/position/libqtposition_android.so \
370369 # END
370+
371+ exists ($$[QT_INSTALL_PLUGINS]/imageformats/libqjp2.so ): \
372+ ANDROID_DEPLOYMENT_DEPENDENCIES += plugins/imageformats/libqjp2.so
371373
372374 # Do not use qtsingleapplication
373375 LIBS -= -lqtsingleapplication
Original file line number Diff line number Diff line change @@ -78,7 +78,6 @@ android {
7878 plugins/imageformats/libqgif.so \
7979 plugins/imageformats/libqicns.so \
8080 plugins/imageformats/libqico.so \
81- plugins/imageformats/libqjp2.so \
8281 plugins/imageformats/libqjpeg.so \
8382 plugins/imageformats/libqtiff.so \
8483 plugins/imageformats/libqwebp.so \
@@ -92,6 +91,9 @@ android {
9291 jar/QtPositioning-bundled.jar \
9392 plugins/position/libqtposition_android.so \
9493 # END
94+
95+ exists($$[QT_INSTALL_PLUGINS]/imageformats/libqjp2.so): \
96+ ANDROID_DEPLOYMENT_DEPENDENCIES += plugins/imageformats/libqjp2.so
9597
9698 # Do not use qtsingleapplication
9799 LIBS -= -lqtsingleapplication
You can’t perform that action at this time.
0 commit comments