1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Android: remove unused plugins

Browse Source 
These plugins can't be used on Android, but they are built, installed
and also bundled into every .apk file.

Change-Id: I3326c913282af5bd43e1c732de9ae2f255711414
Reviewed-by: Christian Stromme <christian.stromme@qt.io>
This commit is contained in:
BogDan Vatra 2016-06-01 11:48:08 +03:00
parent 688f70634c
commit 492cfe7002
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
configure vendored
View File

@ -3216,6 +3216,9 @@ if [ "$XPLATFORM_ANDROID" = "yes" ]; then
if [ "$CFG_DBUS" = "auto" ]; then if [ "$CFG_DBUS" = "auto" ]; then
CFG_DBUS="no" CFG_DBUS="no"
fi fi
if [ "$CFG_EGLFS" = "auto" ]; then
CFG_EGLFS="no"
fi
if [ -z "$CFG_DEFAULT_ANDROID_NDK_HOST" ]; then if [ -z "$CFG_DEFAULT_ANDROID_NDK_HOST" ]; then
case $PLATFORM in case $PLATFORM in
linux-*) linux-*)

4
src/plugins/platforms/platforms.pro
View File

@ -2,9 +2,9 @@ TEMPLATE = subdirs
android:!android-no-sdk: SUBDIRS += android android:!android-no-sdk: SUBDIRS += android
SUBDIRS += minimal !android: SUBDIRS += minimal
!win32|contains(QT_CONFIG, freetype):SUBDIRS += offscreen !android:if(!win32|contains(QT_CONFIG, freetype)): SUBDIRS += offscreen
contains(QT_CONFIG, xcb) { contains(QT_CONFIG, xcb) {
SUBDIRS += xcb SUBDIRS += xcb

2
src/plugins/plugins.pro
View File

@ -6,7 +6,7 @@ qtHaveModule(network):!contains(QT_DISABLED_FEATURES, bearermanagement): SUBDIRS
qtHaveModule(gui) { qtHaveModule(gui) {
SUBDIRS *= platforms platforminputcontexts platformthemes SUBDIRS *= platforms platforminputcontexts platformthemes
!contains(QT_DISABLED_FEATURES, imageformatplugin): SUBDIRS *= imageformats !contains(QT_DISABLED_FEATURES, imageformatplugin): SUBDIRS *= imageformats
!contains(QT_DISABLED_FEATURES, library): SUBDIRS *= generic !android:!contains(QT_DISABLED_FEATURES, library): SUBDIRS *= generic
} }
qtHaveModule(widgets): SUBDIRS *= styles qtHaveModule(widgets): SUBDIRS *= styles