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/android | |
| 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/android')
| -rw-r--r-- | src/network/android/jar/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | src/network/android/jar/jar.pro | 4 | ||||
| -rw-r--r-- | src/network/android/jar/src/org/qtproject/qt/android/network/QtNetwork.java (renamed from src/network/android/jar/src/org/qtproject/qt5/android/network/QtNetwork.java) | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/network/android/jar/CMakeLists.txt b/src/network/android/jar/CMakeLists.txt index c2635ec666..e8081c025b 100644 --- a/src/network/android/jar/CMakeLists.txt +++ b/src/network/android/jar/CMakeLists.txt @@ -1,16 +1,16 @@ # Generated from jar.pro. set(java_sources - src/org/qtproject/qt5/android/network/QtNetwork.java + src/org/qtproject/qt/android/network/QtNetwork.java ) -qt_internal_add_jar(QtAndroidNetwork +qt_internal_add_jar(Qt${QtBase_VERSION_MAJOR}AndroidNetwork # special case INCLUDE_JARS ${QT_ANDROID_JAR} SOURCES ${java_sources} OUTPUT_DIR "${QT_BUILD_DIR}/jar" ) -install_jar(QtAndroidNetwork +install_jar(Qt${QtBase_VERSION_MAJOR}AndroidNetwork # special case DESTINATION jar COMPONENT Devel ) diff --git a/src/network/android/jar/jar.pro b/src/network/android/jar/jar.pro index 4af1012c1c..dd05da3a19 100644 --- a/src/network/android/jar/jar.pro +++ b/src/network/android/jar/jar.pro @@ -1,6 +1,6 @@ CONFIG += single_arch -TARGET = QtAndroidNetwork +TARGET = Qt$${QT_MAJOR_VERSION}AndroidNetwork load(qt_build_paths) CONFIG += java @@ -8,7 +8,7 @@ DESTDIR = $$MODULE_BASE_OUTDIR/jar JAVACLASSPATH += $$PWD/src -JAVASOURCES += $$PWD/src/org/qtproject/qt5/android/network/QtNetwork.java +JAVASOURCES += $$PWD/src/org/qtproject/qt/android/network/QtNetwork.java # install target.path = $$[QT_INSTALL_PREFIX]/jar diff --git a/src/network/android/jar/src/org/qtproject/qt5/android/network/QtNetwork.java b/src/network/android/jar/src/org/qtproject/qt/android/network/QtNetwork.java index 249ffe61a5..8f0abf285f 100644 --- a/src/network/android/jar/src/org/qtproject/qt5/android/network/QtNetwork.java +++ b/src/network/android/jar/src/org/qtproject/qt/android/network/QtNetwork.java @@ -37,7 +37,7 @@ ** ****************************************************************************/ -package org.qtproject.qt5.android.network; +package org.qtproject.qt.android.network; import android.content.BroadcastReceiver; import android.content.Context; |