diff options
| author | BogDan Vatra <bogdan@kdab.com> | 2016-06-01 11:48:08 +0300 |
|---|---|---|
| committer | BogDan Vatra <bogdan@kdab.com> | 2016-06-03 09:47:09 +0000 |
| commit | 492cfe7002a41d5eb542f467bc8ce4a281dc11c6 (patch) | |
| tree | 54682d9b030d279ac826ba6efd22878a573fdf46 /src/plugins | |
| parent | 688f70634cfe18fd215a958ef339e883aef5d4a3 (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>
Diffstat (limited to 'src/plugins')
| -rw-r--r-- | src/plugins/platforms/platforms.pro | 4 | ||||
| -rw-r--r-- | src/plugins/plugins.pro | 2 |
2 files changed, 3 insertions, 3 deletions
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 |