diff options
| author | Jake Petroules <jake.petroules@qt.io> | 2017-09-04 22:09:04 -0700 |
|---|---|---|
| committer | Jake Petroules <jake.petroules@qt.io> | 2017-09-06 18:21:51 +0000 |
| commit | dbb8f97bf3e3a50c6841ab79bbf4b5d6294b8d65 (patch) | |
| tree | cc226e2474448fe4a7b4823ba32433654d373e51 /src/android/nfc/nfc.pro | |
| parent | 1c27afaed55a01570cae04b5dc46ddb9884c6566 (diff) | |
Android: remove support for local/debug deployment
This removes the pre-dexed JAR files activated by the absence of the
bundled_jar_file CONFIG option, as versions of Android >= 5 no longer
support this deployment mechanism.
Now, the "bundled" JARs simply become normal JARs containing class
files, and are neither activated by a bundled_jar_file CONFIG entry nor
do they have a -bundled suffix in the file's base name.
Task-number: QTBUG-62995
Change-Id: Ifc13542ff71844da7e80cefe9ff51e3d7cdfc830
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Diffstat (limited to 'src/android/nfc/nfc.pro')
| -rw-r--r-- | src/android/nfc/nfc.pro | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/src/android/nfc/nfc.pro b/src/android/nfc/nfc.pro index 70373fe1..89026b75 100644 --- a/src/android/nfc/nfc.pro +++ b/src/android/nfc/nfc.pro @@ -1,3 +1,14 @@ -TEMPLATE = subdirs -SUBDIRS += bundledjar.pro distributedjar.pro +TARGET = QtNfc +CONFIG += java +DESTDIR = $$[QT_INSTALL_PREFIX/get]/jar + +PATHPREFIX = $$PWD/src/org/qtproject/qt5/android/nfc + +JAVACLASSPATH += $$PWD/src/ +JAVASOURCES += \ + $$PWD/src/org/qtproject/qt5/android/nfc/QtNfc.java + +# install +target.path = $$[QT_INSTALL_PREFIX]/jar +INSTALLS += target |