diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2020-09-29 11:48:04 +0300 |
|---|---|---|
| committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2020-10-03 11:22:35 +0300 |
| commit | 1907599bfd817e00c7f42b8cb941ebf93a098e7f (patch) | |
| tree | 643210622dc9ef0c218210453d7f8bd98aa60599 /src/network/kernel | |
| parent | 4e675cb85e81b67f36473914f5822dd6e626ddf0 (diff) | |
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 <alexandru.croitor@qt.io>
Diffstat (limited to 'src/network/kernel')
| -rw-r--r-- | src/network/kernel/kernel.pri | 2 | ||||
| -rw-r--r-- | src/network/kernel/qnetworkproxy_android.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
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() { |