diff options
| author | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2025-08-21 17:39:22 +0300 |
|---|---|---|
| committer | Assam Boudjelthia <assam.boudjelthia@qt.io> | 2025-08-26 22:57:44 +0300 |
| commit | f149f306682abc30094d51d0285166ff2f4560dc (patch) | |
| tree | 2bcf8321cd7ee383382c4805c30870fd0f97308e /src/plugins/platforms/android/qandroidplatformopenglwindow.cpp | |
| parent | cb972cd5facdd7031828c8dbd50361aa7be6590c (diff) | |
Android: move AndroidDeadlockProtector to QtAndroidPrivate namespace
This way it can be used by all Qt code and not only under the
platform plugin and avoid cases where it's forgotten to manually
release it when only using acquireAndroidDeadlockProtector().
Pick-to: 6.10
Change-Id: Ie7658b4057d499c470cf7d8706928870edabcf0e
Reviewed-by: Ville Voutilainen <ville.voutilainen@qt.io>
Diffstat (limited to 'src/plugins/platforms/android/qandroidplatformopenglwindow.cpp')
| -rw-r--r-- | src/plugins/platforms/android/qandroidplatformopenglwindow.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/plugins/platforms/android/qandroidplatformopenglwindow.cpp b/src/plugins/platforms/android/qandroidplatformopenglwindow.cpp index a23da707d61..95a4963756d 100644 --- a/src/plugins/platforms/android/qandroidplatformopenglwindow.cpp +++ b/src/plugins/platforms/android/qandroidplatformopenglwindow.cpp @@ -4,7 +4,6 @@ #include "qandroidplatformopenglwindow.h" -#include "androiddeadlockprotector.h" #include "androidjnimain.h" #include "qandroideventdispatcher.h" #include "qandroidplatformscreen.h" @@ -61,7 +60,7 @@ EGLSurface QAndroidPlatformOpenGLWindow::eglSurface(EGLConfig config) // If we haven't called createSurface() yet, call it and wait until Android has created // the Surface if (!m_surfaceCreated) { - AndroidDeadlockProtector protector; + QtAndroidPrivate::AndroidDeadlockProtector protector; if (!protector.acquire()) { static constexpr char funcName[] = "QAndroidPlatformOpenGLWindow::eglSurface()"; qFatal("Failed to acquire deadlock protector for %s.", funcName); |