diff options
| author | Tinja Paavoseppä <tinja.paavoseppa@qt.io> | 2023-09-05 09:01:46 +0300 |
|---|---|---|
| committer | Tinja Paavoseppä <tinja.paavoseppa@qt.io> | 2023-12-08 15:53:36 +0200 |
| commit | 0a92d881bb91d3ff14187e7838af1cad9ad1070c (patch) | |
| tree | 0ff35b64f6213d749d1da9fa10746632b06a5dfd /src/plugins/platforms/android/qandroidplatformvulkanwindow.cpp | |
| parent | 0bfec6cd1183f4985733e355f01f6e12df2fb2be (diff) | |
Android: Make QtLayout per window instead of per screen
Each QAndroidPlatformWindow has its own QtLayout,
instead of one for the whole app/screen. This paves the
way for addition of child windows.
Task-number: QTBUG-116187
Change-Id: I36c68cea1a5f27ded3696bcfc2fbc04d9a8ce79e
Reviewed-by: Tor Arne Vestbø <tor.arne.vestbo@qt.io>
Reviewed-by: Assam Boudjelthia <assam.boudjelthia@qt.io>
Diffstat (limited to 'src/plugins/platforms/android/qandroidplatformvulkanwindow.cpp')
| -rw-r--r-- | src/plugins/platforms/android/qandroidplatformvulkanwindow.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/platforms/android/qandroidplatformvulkanwindow.cpp b/src/plugins/platforms/android/qandroidplatformvulkanwindow.cpp index df87240c2b0..43b3a903734 100644 --- a/src/plugins/platforms/android/qandroidplatformvulkanwindow.cpp +++ b/src/plugins/platforms/android/qandroidplatformvulkanwindow.cpp @@ -94,7 +94,7 @@ VkSurfaceKHR *QAndroidPlatformVulkanWindow::vkSurface() clearSurface(); QMutexLocker lock(&m_surfaceMutex); - if (m_nativeSurfaceId == -1) { + if (!m_surfaceCreated) { AndroidDeadlockProtector protector; if (!protector.acquire()) return &m_vkSurface; @@ -102,7 +102,7 @@ VkSurfaceKHR *QAndroidPlatformVulkanWindow::vkSurface() m_surfaceWaitCondition.wait(&m_surfaceMutex); } - if (m_nativeSurfaceId == -1 || !m_androidSurfaceObject.isValid()) + if (!m_surfaceCreated || !m_androidSurfaceObject.isValid()) return &m_vkSurface; QJniEnvironment env; |