diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2020-09-29 12:04:23 +0300 |
|---|---|---|
| committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2021-02-12 11:50:22 +0300 |
| commit | ed8e6dddbb48e5743433fe65228fc0068c9555ed (patch) | |
| tree | 452b4e55378e6b185d6a9a7ac3dacacb421484e4 /src | |
| parent | b99bc97935ac37c2690ae4beb4715ebb962f0eab (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: If887ac62ff480986f70434e5ab898d0bb9f19606
Reviewed-by: Alex Blasche <alexander.blasche@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/jar/jar.pro | 4 | ||||
| -rw-r--r-- | src/jar/src/org/qtproject/qt/android/view/QtAndroidWebViewController.java (renamed from src/jar/src/org/qtproject/qt5/android/view/QtAndroidWebViewController.java) | 2 | ||||
| -rw-r--r-- | src/plugins/android/qandroidwebview.cpp | 2 | ||||
| -rw-r--r-- | src/webview/webview.pro | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/jar/jar.pro b/src/jar/jar.pro index c432dc0..b248a1d 100644 --- a/src/jar/jar.pro +++ b/src/jar/jar.pro @@ -1,4 +1,4 @@ -TARGET = QtAndroidWebView +TARGET = Qt$${QT_MAJOR_VERSION}AndroidWebView load(qt_build_paths) CONFIG += java @@ -6,7 +6,7 @@ DESTDIR = $$MODULE_BASE_OUTDIR/jar JAVACLASSPATH += $$PWD/src -JAVASOURCES += $$PWD/src/org/qtproject/qt5/android/view/QtAndroidWebViewController.java +JAVASOURCES += $$PWD/src/org/qtproject/qt/android/view/QtAndroidWebViewController.java # install target.path = $$[QT_INSTALL_PREFIX]/jar diff --git a/src/jar/src/org/qtproject/qt5/android/view/QtAndroidWebViewController.java b/src/jar/src/org/qtproject/qt/android/view/QtAndroidWebViewController.java index 0bb36de..5994d65 100644 --- a/src/jar/src/org/qtproject/qt5/android/view/QtAndroidWebViewController.java +++ b/src/jar/src/org/qtproject/qt/android/view/QtAndroidWebViewController.java @@ -34,7 +34,7 @@ ** ****************************************************************************/ -package org.qtproject.qt5.android.view; +package org.qtproject.qt.android.view; import android.content.pm.PackageManager; import android.view.View; diff --git a/src/plugins/android/qandroidwebview.cpp b/src/plugins/android/qandroidwebview.cpp index 3c7b759..5a9dbbc 100644 --- a/src/plugins/android/qandroidwebview.cpp +++ b/src/plugins/android/qandroidwebview.cpp @@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE -static const char qtAndroidWebViewControllerClass[] = "org/qtproject/qt5/android/view/QtAndroidWebViewController"; +static const char qtAndroidWebViewControllerClass[] = "org/qtproject/qt/android/view/QtAndroidWebViewController"; //static bool favIcon(JNIEnv *env, jobject icon, QImage *image) //{ diff --git a/src/webview/webview.pro b/src/webview/webview.pro index 2203014..74ef931 100644 --- a/src/webview/webview.pro +++ b/src/webview/webview.pro @@ -36,7 +36,7 @@ QMAKE_DOCS = \ $$PWD/doc/qtwebview.qdocconf ANDROID_BUNDLED_JAR_DEPENDENCIES = \ - jar/QtAndroidWebView.jar + jar/Qt$${QT_MAJOR_VERSION}AndroidWebView.jar ANDROID_PERMISSIONS = \ android.permission.ACCESS_FINE_LOCATION ANDROID_LIB_DEPENDENCIES = \ |