diff options
author | Jake Petroules <jake.petroules@qt.io> | 2017-09-04 18:53:56 -0700 |
---|---|---|
committer | Jake Petroules <jake.petroules@qt.io> | 2017-09-06 18:21:02 +0000 |
commit | cab060631c9c650fca787b0775263bb2bb6ad764 (patch) | |
tree | b6072d15e9ac405a1bc1319f80240e8b2eadc01f /src/android/jar/jar.pro | |
parent | 0fcb6c26c1f4a0506bfa7dba181ed6db4e02bdb0 (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: I3fa6819259be365b7a697f7db1d1d01a94032395
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Diffstat (limited to 'src/android/jar/jar.pro')
-rw-r--r-- | src/android/jar/jar.pro | 30 |
1 files changed, 28 insertions, 2 deletions
diff --git a/src/android/jar/jar.pro b/src/android/jar/jar.pro index 8d19c1b7d6..603e28aeee 100644 --- a/src/android/jar/jar.pro +++ b/src/android/jar/jar.pro @@ -1,2 +1,28 @@ -TEMPLATE = subdirs -SUBDIRS += bundledjar.pro distributedjar.pro +TARGET = QtAndroid + +CONFIG += java +DESTDIR = $$[QT_INSTALL_PREFIX/get]/jar +API_VERSION = android-16 + +PATHPREFIX = $$PWD/src/org/qtproject/qt5/android/ + +JAVACLASSPATH += $$PWD/src/ +JAVASOURCES += \ + $$PATHPREFIX/accessibility/QtAccessibilityDelegate.java \ + $$PATHPREFIX/accessibility/QtNativeAccessibility.java \ + $$PATHPREFIX/QtActivityDelegate.java \ + $$PATHPREFIX/QtEditText.java \ + $$PATHPREFIX/QtInputConnection.java \ + $$PATHPREFIX/QtLayout.java \ + $$PATHPREFIX/QtMessageDialogHelper.java \ + $$PATHPREFIX/QtNative.java \ + $$PATHPREFIX/QtNativeLibrariesDir.java \ + $$PATHPREFIX/QtSurface.java \ + $$PATHPREFIX/ExtractStyle.java \ + $$PATHPREFIX/EditMenu.java \ + $$PATHPREFIX/EditPopupMenu.java \ + $$PATHPREFIX/CursorHandle.java + +# install +target.path = $$[QT_INSTALL_PREFIX]/jar +INSTALLS += target |