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/tools | |
| 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/tools')
| -rw-r--r-- | src/tools/androiddeployqt/main.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/tools/androiddeployqt/main.cpp b/src/tools/androiddeployqt/main.cpp index 047d78773d..daf3878230 100644 --- a/src/tools/androiddeployqt/main.cpp +++ b/src/tools/androiddeployqt/main.cpp @@ -680,7 +680,7 @@ bool alwaysOverwritableFile(const QString &fileName) return (fileName.endsWith(QLatin1String("/res/values/libs.xml")) || fileName.endsWith(QLatin1String("/AndroidManifest.xml")) || fileName.endsWith(QLatin1String("/res/values/strings.xml")) - || fileName.endsWith(QLatin1String("/src/org/qtproject/qt5/android/bindings/QtActivity.java"))); + || fileName.endsWith(QLatin1String("/src/org/qtproject/qt/android/bindings/QtActivity.java"))); } |