From 9a58062a7392563858682e4b61cfb4ac7caf27bc Mon Sep 17 00:00:00 2001 From: Assam Boudjelthia Date: Sat, 5 Mar 2022 13:55:04 +0200 Subject: [PATCH] Android: print correct return code of main() ... and print it always after main() returns. Task-number: QTBUG-118077 Change-Id: I1f57b3f7a646d01eebf67d4a4ff6a8d9f6e82cc7 Reviewed-by: Ville Voutilainen --- src/plugins/platforms/android/androidjnimain.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/plugins/platforms/android/androidjnimain.cpp b/src/plugins/platforms/android/androidjnimain.cpp index 1eed40df4c7..f6819643574 100644 --- a/src/plugins/platforms/android/androidjnimain.cpp +++ b/src/plugins/platforms/android/androidjnimain.cpp @@ -517,7 +517,8 @@ static void startQtApplication(JNIEnv */*env*/, jclass /*clazz*/) argv[argc] = nullptr; startQtAndroidPluginCalled.fetchAndAddRelease(1); - int ret = m_main(argc, argv.data()); + const int ret = m_main(argc, argv.data()); + qInfo() << "main() returned" << ret; if (m_mainLibraryHnd) { int res = dlclose(m_mainLibraryHnd); @@ -525,10 +526,8 @@ static void startQtApplication(JNIEnv */*env*/, jclass /*clazz*/) qWarning() << "dlclose failed:" << dlerror(); } - if (m_applicationClass) { - qWarning("exit app 0"); + if (m_applicationClass) QJniObject::callStaticMethod(m_applicationClass, "quitApp", "()V"); - } sem_post(&m_terminateSemaphore); sem_wait(&m_exitSemaphore);