path: root/src/plugins
diff options
authorEskil Abrahamsen Blomfeldt <>2015-01-22 10:48:39 +0100
committerEskil Abrahamsen Blomfeldt <>2015-01-22 10:58:41 +0100
commit06602f9c96e9ea07851fa1d8a43b9792a825c4cd (patch)
treea6ff752a1e524be77d36c178684629a88c26f56f /src/plugins
parent586fd042345b619acceafb13e84b912863961e56 (diff)
Android: Don't force-include android-9 headers in qpa plugin
When we supported platforms < android-9, we needed to include some headers which were introduced in android-9 to compile the QPA plugin. This is no longer needed, and also creates problems when you pick e.g. android-21 as your platform, since some definitions (specifically fd_set) are different in the two sets of headers, giving us an undefined reference to QEventDispatcherUNIX::select(). Change-Id: Ifd28479b4bf3be0e9e62200a01fc4cf2cc855215 Reviewed-by: BogDan Vatra <>
Diffstat (limited to 'src/plugins')
1 files changed, 1 insertions, 6 deletions
diff --git a/src/plugins/platforms/android/ b/src/plugins/platforms/android/
index 3c3a4b4b2e..e6f4db0e94 100644
--- a/src/plugins/platforms/android/
+++ b/src/plugins/platforms/android/
@@ -8,12 +8,7 @@ DEFINES += QT_STATICPLUGIN
-!contains(ANDROID_PLATFORM, android-9) {
- INCLUDEPATH += $$NDK_ROOT/platforms/android-9/arch-$$ANDROID_ARCHITECTURE/usr/include
- LIBS += -L$$NDK_ROOT/platforms/android-9/arch-$$ANDROID_ARCHITECTURE/usr/lib -ljnigraphics -landroid
-} else {
- LIBS += -ljnigraphics -landroid
+LIBS += -ljnigraphics -landroid
QT += core-private gui-private platformsupport-private