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/nfc | |
| 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/nfc')
| -rw-r--r-- | src/nfc/nfc.pro | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/nfc/nfc.pro b/src/nfc/nfc.pro index 5282170e..ae65640a 100644 --- a/src/nfc/nfc.pro +++ b/src/nfc/nfc.pro @@ -86,8 +86,6 @@ linux:!android:qtHaveModule(dbus) { ANDROID_PERMISSIONS = \ android.permission.NFC ANDROID_BUNDLED_JAR_DEPENDENCIES = \ - jar/QtNfc-bundled.jar:org.qtproject.qt5.android.nfc.QtNfc - ANDROID_JAR_DEPENDENCIES = \ jar/QtNfc.jar:org.qtproject.qt5.android.nfc.QtNfc DEFINES += ANDROID_NFC QT_PRIVATE += core-private gui androidextras |