diff options
| author | Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com> | 2013-09-23 17:10:33 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-26 08:40:38 +0200 |
| commit | 39e04b022227c52c9e6aac1942919f68247e1394 (patch) | |
| tree | b7cfefec21d5a8640cdc14602ff031e666f0daaa | |
| parent | 0a3a05f418a7c79cf11f0851f9793c558e3656e8 (diff) | |
Remove logic which changes install rules inside Qt dir
A common problem is that examples and other apps are unusable on
Android when they are inside the Qt directory. There doesn't
really seem to be any good reason for having a special case in
place, since this will only affect applications which are not built
with the host toolchain, and we aren't building any command line
apps for the target devices. So the only thing this will affect are
the examples and we want those to be installed into the correct
path.
Change-Id: Ibae365e06eb77944f11e596c16c3c5baf798848c
Reviewed-by: BogDan Vatra <bogdan@kde.org>
| -rw-r--r-- | mkspecs/features/android.prf | 13 | ||||
| -rw-r--r-- | src/android/java/java.pro | 2 |
2 files changed, 6 insertions, 9 deletions
diff --git a/mkspecs/features/android.prf b/mkspecs/features/android.prf index 2a3086d4ad..5e21f0b845 100644 --- a/mkspecs/features/android.prf +++ b/mkspecs/features/android.prf @@ -2,13 +2,10 @@ contains(TEMPLATE, ".*app") { !android_app { !contains(TARGET, ".so"): TARGET = lib$${TARGET}.so QMAKE_LFLAGS += -Wl,-soname,$$TARGET + + android_install: { + target.path=/libs/$$ANDROID_TARGET_ARCH/ + INSTALLS *= target + } } } -!QTDIR_build:android_install { - isEmpty(QT_BUILD_TREE) { - target.path=/libs/$$ANDROID_TARGET_ARCH/ - } else { - target.path = / - } - INSTALLS *= target -} diff --git a/src/android/java/java.pro b/src/android/java/java.pro index 22c8ecc034..9d682e4f23 100644 --- a/src/android/java/java.pro +++ b/src/android/java/java.pro @@ -1,4 +1,4 @@ -CONFIG -= qt +CONFIG -= qt android_install javaresources.files = \ $$PWD/AndroidManifest.xml \ |