From dbe4d2d7f9d6e8179d38a73481e59d5ebb4c43fe Mon Sep 17 00:00:00 2001
From: Aleix Pol <aleixpol@kde.org>
Date: Tue, 17 Apr 2018 04:47:04 +0200
Subject: Don't install plugins within lib on android

Summary:
Otherwise we hit a weird code path on androiddeployqt. This is what the official SDK looks like anyway:
```
$ ls /opt/Qt/5.10.1/android_armv7/
bin  doc  include  jar  lib  mkspecs  plugins  qml  src  translations
```

Reviewers: vkrause

Reviewed By: vkrause

Subscribers: #frameworks, #build_system

Tags: #frameworks, #build_system

Differential Revision: https://phabricator.kde.org/D12269
---
 kde-modules/KDEInstallDirs.cmake | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'kde-modules/KDEInstallDirs.cmake')

diff --git a/kde-modules/KDEInstallDirs.cmake b/kde-modules/KDEInstallDirs.cmake
index 5c8783b5..67218bf2 100644
--- a/kde-modules/KDEInstallDirs.cmake
+++ b/kde-modules/KDEInstallDirs.cmake
@@ -488,7 +488,12 @@ if(KDE_INSTALL_USE_QT_SYS_PATHS)
         "QtQuick2 imports"
         QML_INSTALL_DIR)
 else()
-    _define_relative(QTPLUGINDIR LIBDIR "plugins"
+    set(_pluginsDirParent LIBDIR)
+    if (ANDROID)
+        set(_pluginsDirParent)
+        #androiddeployqt wants plugins right in the prefix
+    endif()
+    _define_relative(QTPLUGINDIR "${_pluginsDirParent}" "plugins"
         "Qt plugins"
         QT_PLUGIN_INSTALL_DIR)
 
-- 
cgit v1.2.1