diff options
authorEskil Abrahamsen Blomfeldt <>2014-01-08 12:24:50 +0100
committerThe Qt Project <>2014-01-15 16:08:57 +0100
commit110d36fee82aabfc951bbd50549e809ca3649aa3 (patch)
parenta695edef569671068dfa30f301e34f0883128c6b (diff)
REG: Fix make install on library projects on Android
This is a partial revert of 39e04b022227c52c9e6aac1942919f68247e1394. The original change moved the special make install target path logic into the logic for the app template to make it possible to remove the condition that excluded builds inside the Qt directory. This was to make it possible to build examples in the Qt directory for Android without moving them. However, this broke user library projects, specifically when they were part of a subdirs project and should have been automatically installed into the Android package. This patch brings back the logic but only enables it for library projects, meaning that the only examples inside Qt which cannot be built correctly are library projects (which didn't work anyway). [ChangeLog][Android] Fixed regression in "make install" on library projects on Android so they can be used inside subdirs projects again. Task-number: QTBUG-34781 Change-Id: Iabf53ed68845b2ddd4ae66656e1372c96185660e Reviewed-by: Oswald Buddenhagen <> Reviewed-by: Paul Olav Tvete <>
1 files changed, 3 insertions, 0 deletions
diff --git a/mkspecs/features/android/android.prf b/mkspecs/features/android/android.prf
index 5e21f0b845..9e86110da6 100644
--- a/mkspecs/features/android/android.prf
+++ b/mkspecs/features/android/android.prf
@@ -8,4 +8,7 @@ contains(TEMPLATE, ".*app") {
INSTALLS *= target
+} else: contains(TEMPLATE, "lib"):!QTDIR_build:android_install {
+ target.path = /libs/$$ANDROID_TARGET_ARCH/
+ INSTALLS *= target