diff options
| -rw-r--r-- | src/plugins/platforms/android/androidjnimain.cpp | 22 | ||||
| -rw-r--r-- | src/plugins/platforms/android/androidjnimain.h | 2 |
2 files changed, 0 insertions, 24 deletions
diff --git a/src/plugins/platforms/android/androidjnimain.cpp b/src/plugins/platforms/android/androidjnimain.cpp index 1b2eb69b2e8..5bd2b924fc4 100644 --- a/src/plugins/platforms/android/androidjnimain.cpp +++ b/src/plugins/platforms/android/androidjnimain.cpp @@ -54,8 +54,6 @@ static jobject m_resourcesObj = nullptr; static jclass m_qtActivityClass = nullptr; static jclass m_qtServiceClass = nullptr; -static QtJniTypes::QtActivityDelegateBase m_activityDelegate = nullptr; - static int m_pendingApplicationState = -1; static QBasicMutex m_platformMutex; @@ -92,7 +90,6 @@ static const char m_methodErrorMsg[] = "Can't find method \"%s%s\""; Q_CONSTINIT static QBasicAtomicInt startQtAndroidPluginCalled = Q_BASIC_ATOMIC_INITIALIZER(0); -Q_DECLARE_JNI_CLASS(QtEmbeddedDelegateFactory, "org/qtproject/qt/android/QtEmbeddedDelegateFactory") Q_DECLARE_JNI_CLASS(QtWindowInterface, "org/qtproject/qt/android/QtWindowInterface") Q_DECLARE_JNI_CLASS(QtAccessibilityInterface, "org/qtproject/qt/android/QtAccessibilityInterface"); @@ -190,25 +187,6 @@ namespace QtAndroid jint(uiVisibility)); } - // FIXME: avoid direct access to QtActivityDelegate - QtJniTypes::QtActivityDelegateBase qtActivityDelegate() - { - using namespace QtJniTypes; - if (!m_activityDelegate.isValid()) { - if (isQtApplication()) { - auto context = QtAndroidPrivate::activity(); - m_activityDelegate = context.callMethod<QtActivityDelegateBase>("getActivityDelegate"); - } else { - m_activityDelegate = QJniObject::callStaticMethod<QtActivityDelegateBase>( - Traits<QtEmbeddedDelegateFactory>::className(), - "getActivityDelegate", - QtAndroidPrivate::activity()); - } - } - - return m_activityDelegate; - } - bool isQtApplication() { // Returns true if the app is a Qt app, i.e. Qt controls the whole app and diff --git a/src/plugins/platforms/android/androidjnimain.h b/src/plugins/platforms/android/androidjnimain.h index b916446ea3c..9d616b18fba 100644 --- a/src/plugins/platforms/android/androidjnimain.h +++ b/src/plugins/platforms/android/androidjnimain.h @@ -50,8 +50,6 @@ namespace QtAndroid AAssetManager *assetManager(); jclass applicationClass(); - QtJniTypes::QtActivityDelegateBase qtActivityDelegate(); - // Keep synchronized with flags in ActivityDelegate.java enum SystemUiVisibility { SYSTEM_UI_VISIBILITY_NORMAL = 0, |