diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2024-10-31 16:05:15 +0100 |
|---|---|---|
| committer | Michal Klocek <michal.klocek@qt.io> | 2024-11-07 19:53:36 +0100 |
| commit | 35630578ba823691268f8e6ffacc4b6c64eded59 (patch) | |
| tree | 588b99dc2c171cb88a07932017a24bbf567d8344 /src/plugins/android/qandroidwebview.cpp | |
| parent | 94b6756d1d72ae4676d025c12e8da238093c1986 (diff) | |
Fix namespace build on android
Deals with:
* src/plugins/android/qandroidwebview_p.h:26:1: error: no template named 'JObject';
did you mean 'TestQTNamespace::QtJniTypes::JObject'?
* src/plugins/android/qandroidwebview.cpp:313:1: error: reference to 'QtJniMethods' is ambiguous
Pick-to: 6.8
Change-Id: I6c90b4c93ffac240708b3bdc6e4b22a3a3b41cfa
Reviewed-by: Christian StrΓΈmme <christian.stromme@qt.io>
Diffstat (limited to 'src/plugins/android/qandroidwebview.cpp')
| -rw-r--r-- | src/plugins/android/qandroidwebview.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/plugins/android/qandroidwebview.cpp b/src/plugins/android/qandroidwebview.cpp index 6bd0a2e..230b913 100644 --- a/src/plugins/android/qandroidwebview.cpp +++ b/src/plugins/android/qandroidwebview.cpp @@ -278,8 +278,6 @@ void QAndroidWebViewPrivate::onApplicationStateChanged(Qt::ApplicationState stat m_viewController.callMethod<void>("onPause"); } -QT_END_NAMESPACE - static void c_onRunJavaScriptResult(JNIEnv *env, jobject thiz, jlong id, @@ -481,6 +479,7 @@ static void c_onCookieRemoved(JNIEnv *env, Q_EMIT wc->cookieRemoved(QJniObject(domain).toString(), QJniObject(name).toString()); } Q_DECLARE_JNI_NATIVE_METHOD(c_onCookieRemoved) +QT_END_NAMESPACE JNIEXPORT jint JNI_OnLoad(JavaVM* /* vm */, void* /*reserved*/) { |