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/network | |
| 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/network')
| -rw-r--r-- | src/network/network.pro | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/network/network.pro b/src/network/network.pro index 98fbf82275..b8272d91d6 100644 --- a/src/network/network.pro +++ b/src/network/network.pro @@ -24,8 +24,6 @@ QMAKE_LIBS += $$QMAKE_LIBS_NETWORK qtConfig(bearermanagement) { ANDROID_BUNDLED_JAR_DEPENDENCIES = \ - jar/QtAndroidBearer-bundled.jar - ANDROID_JAR_DEPENDENCIES = \ jar/QtAndroidBearer.jar ANDROID_LIB_DEPENDENCIES = \ plugins/bearer/libqandroidbearer.so |