From 1907599bfd817e00c7f42b8cb941ebf93a098e7f Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Tue, 29 Sep 2020 11:48:04 +0300 Subject: Android: rename Android's package name for Qt 6 Rename Android package name org.qtproject.qt5.android to org.qtproject.qt.android to avoid inconsistency with Qt 6 name. Also, we include the major version number in the jar target. Task-number: QTBUG-86969 Change-Id: Ibb68947289be1079911b34ea157bf089cc52c47f Reviewed-by: Alexandru Croitor --- src/network/kernel/kernel.pri | 2 +- src/network/kernel/qnetworkproxy_android.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/network/kernel') diff --git a/src/network/kernel/kernel.pri b/src/network/kernel/kernel.pri index cc78555805..aa3e9df254 100644 --- a/src/network/kernel/kernel.pri +++ b/src/network/kernel/kernel.pri @@ -92,4 +92,4 @@ else:android: SOURCES += kernel/qnetworkproxy_android.cpp else: SOURCES += kernel/qnetworkproxy_generic.cpp android: ANDROID_BUNDLED_JAR_DEPENDENCIES = \ - jar/QtAndroidNetwork.jar + jar/Qt$${QT_MAJOR_VERSION}AndroidNetwork.jar diff --git a/src/network/kernel/qnetworkproxy_android.cpp b/src/network/kernel/qnetworkproxy_android.cpp index ddfe86960f..1a6fe2b70e 100644 --- a/src/network/kernel/qnetworkproxy_android.cpp +++ b/src/network/kernel/qnetworkproxy_android.cpp @@ -54,7 +54,7 @@ public: Q_GLOBAL_STATIC(ProxyInfoObject, proxyInfoInstance) -static const char networkClass[] = "org/qtproject/qt5/android/network/QtNetwork"; +static const char networkClass[] = "org/qtproject/qt/android/network/QtNetwork"; ProxyInfoObject::ProxyInfoObject() { -- cgit v1.2.3