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>
This commit is contained in:
Eskil Abrahamsen Blomfeldt 2013-09-23 17:10:33 +02:00 committed by The Qt Project
parent 0a3a05f418
commit 39e04b0222
2 changed files with 6 additions and 9 deletions

View File

@ -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
}

View File

@ -1,4 +1,4 @@
CONFIG -= qt
CONFIG -= qt android_install
javaresources.files = \
$$PWD/AndroidManifest.xml \