diff options
| author | Soheil Armin <soheil.armin@qt.io> | 2024-07-10 16:26:22 +0300 |
|---|---|---|
| committer | Soheil Armin <soheil.armin@qt.io> | 2024-08-21 20:57:57 +0300 |
| commit | c23f9cdcfc235786882f49d1dcf90beac5101611 (patch) | |
| tree | c8d6de3f47df6494d8f5caf3c4e402ec54474a56 /src/quick/platform/android/qandroidquickviewembedding.cpp | |
| parent | 3c520ad4802b0fe28f3dfbadd431a73ce791f830 (diff) | |
Android: Remove APIs that are being moved to qtcore
Pick-to: 6.8
Task-number: QTBUG-126976
Task-number: QTBUG-126977
Task-number: QTBUG-127082
Change-Id: I5ed4cccfb2c828cc6ecc3df78a397ec91aa32839
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Diffstat (limited to 'src/quick/platform/android/qandroidquickviewembedding.cpp')
| -rw-r--r-- | src/quick/platform/android/qandroidquickviewembedding.cpp | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/src/quick/platform/android/qandroidquickviewembedding.cpp b/src/quick/platform/android/qandroidquickviewembedding.cpp index 262dd9179c..595e2d690e 100644 --- a/src/quick/platform/android/qandroidquickviewembedding.cpp +++ b/src/quick/platform/android/qandroidquickviewembedding.cpp @@ -1,12 +1,10 @@ // Copyright (C) 2023 The Qt Company Ltd. // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only +#include <QtCore/private/qandroidtypeconverter_p.h> +#include <QtCore/private/qandroidtypes_p.h> #include <QtQuick/private/qandroidquickviewembedding_p.h> -#include <QtQuick/private/qandroidtypes_p.h> -#include <QtQuick/private/qandroidtypeconverter_p.h> #include <QtQuick/private/qandroidviewsignalmanager_p.h> -#include <QtQuick/private/qandroiditemmodelproxy_p.h> -#include <QtQuick/private/qandroidmodelindexproxy_p.h> #include <QtCore/qcoreapplication.h> #include <QtCore/qjnienvironment.h> @@ -320,12 +318,6 @@ Q_DECL_EXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved) return JNI_ERR; if (!QtAndroidQuickViewEmbedding::registerNatives(env)) return JNI_ERR; - if (!QAndroidItemModelProxy::registerAbstractNatives(env)) - return JNI_ERR; - if (!QAndroidItemModelProxy::registerProxyNatives(env)) - return JNI_ERR; - if (!QAndroidModelIndexProxy::registerNatives(env)) - return JNI_ERR; return JNI_VERSION_1_6; } |