1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Android: Use the new runOnAndroidMainThread() call

Browse Source 
Remove the [&] capture in runOnAndroidMainThread() for void type.

Replace the old private QtAndroidPrivate::runOnAndroidThread()
with QAndroidApplication::runOnAndroidMainThread().

Task-number: QTBUG-90501
Change-Id: I41eaf1ea9ee68b22861bf498f12a97a02515cc47
Reviewed-by: Rami Potinkara <rami.potinkara@qt.io>
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
This commit is contained in:
Assam Boudjelthia 2021-06-03 14:07:06 +03:00
parent c08b9a49ba
commit b216b360ac
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/corelib/kernel/qcoreapplication_android.cpp
View File

@ -178,7 +178,7 @@ QFuture<QPermission::PermissionResult> requestPermissionsInternal(const QStringL
QMutexLocker locker(&g_pendingPermissionRequestsMutex); QMutexLocker locker(&g_pendingPermissionRequestsMutex);
g_pendingPermissionRequests->insert(requestCode, promise); g_pendingPermissionRequests->insert(requestCode, promise);
QtAndroidPrivate::runOnAndroidThread([permissions, requestCode] { QNativeInterface::QAndroidApplication::runOnAndroidMainThread([permissions, requestCode] {
QJniEnvironment env; QJniEnvironment env;
jclass clazz = env.findClass("java/lang/String"); jclass clazz = env.findClass("java/lang/String");
auto array = env->NewObjectArray(permissions.size(), clazz, nullptr); auto array = env->NewObjectArray(permissions.size(), clazz, nullptr);
@ -192,7 +192,7 @@ QFuture<QPermission::PermissionResult> requestPermissionsInternal(const QStringL
array, array,
requestCode); requestCode);
env->DeleteLocalRef(array); env->DeleteLocalRef(array);
}, QJniEnvironment().jniEnv()); });
return future; return future;
} }

2
src/corelib/kernel/qcoreapplication_platform.h
View File

@ -78,7 +78,7 @@ struct Q_CORE_EXPORT QAndroidApplication
const QDeadlineTimer const QDeadlineTimer
&timeout = QDeadlineTimer(-1)) &timeout = QDeadlineTimer(-1))
{ {
std::function<QVariant()> func = [&](){ runnable(); return QVariant(); }; std::function<QVariant()> func = [runnable](){ runnable(); return QVariant(); };
return static_cast<QFuture<void>>(runOnAndroidMainThread(func, timeout)); return static_cast<QFuture<void>>(runOnAndroidMainThread(func, timeout));
} }
#endif #endif