summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBogDan Vatra <bogdan@kdab.com>2016-06-01 11:48:08 +0300
committerBogDan Vatra <bogdan@kdab.com>2016-06-03 09:47:09 +0000
commit492cfe7002a41d5eb542f467bc8ce4a281dc11c6 (patch)
tree54682d9b030d279ac826ba6efd22878a573fdf46
parent688f70634cfe18fd215a958ef339e883aef5d4a3 (diff)
Android: remove unused plugins
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>
-rwxr-xr-xconfigure3
-rw-r--r--src/plugins/platforms/platforms.pro4
-rw-r--r--src/plugins/plugins.pro2
3 files changed, 6 insertions, 3 deletions
diff --git a/configure b/configure
index d175ed32b5..be89b22291 100755
--- a/configure
+++ b/configure
@@ -3216,6 +3216,9 @@ if [ "$XPLATFORM_ANDROID" = "yes" ]; then
if [ "$CFG_DBUS" = "auto" ]; then
CFG_DBUS="no"
fi
+ if [ "$CFG_EGLFS" = "auto" ]; then
+ CFG_EGLFS="no"
+ fi
if [ -z "$CFG_DEFAULT_ANDROID_NDK_HOST" ]; then
case $PLATFORM in
linux-*)
diff --git a/src/plugins/platforms/platforms.pro b/src/plugins/platforms/platforms.pro
index 43bb04e318..9b4b6c518a 100644
--- a/src/plugins/platforms/platforms.pro
+++ b/src/plugins/platforms/platforms.pro
@@ -2,9 +2,9 @@ TEMPLATE = subdirs
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) {
SUBDIRS += xcb
diff --git a/src/plugins/plugins.pro b/src/plugins/plugins.pro
index 03b7dc266b..5e180904c7 100644
--- a/src/plugins/plugins.pro
+++ b/src/plugins/plugins.pro
@@ -6,7 +6,7 @@ qtHaveModule(network):!contains(QT_DISABLED_FEATURES, bearermanagement): SUBDIRS
qtHaveModule(gui) {
SUBDIRS *= platforms platforminputcontexts platformthemes
!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