diff options
| author | Andras Becsi <andras.becsi@digia.com> | 2014-05-14 17:53:59 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-05-15 17:37:10 +0200 |
| commit | c0bc770eb1dfcc6689df44438cd396721d5129fc (patch) | |
| tree | f07b2a56863a40c0cc7916910b7dd5977ad5e118 /src/core/surface_factory_qt.h | |
| parent | c45fc409c14f2e4ccb1aacd0b8af36dbba399666 (diff) | |
Enable GLContextHelper and register a SurfaceFactoryQt on eAndroid
This is needed to run on certain hardware that needs the shared EGL
contexts to be created on the same thread.
To prevent a deadlock on eAndroid only use a blocking connection
if we are not on the main thread where the singleton was created,
since there is a call to this from gpu_info_collector_android
before the GPU thread is launched.
Change-Id: I6887ad1218b8426097f454741dc5a79ee94f9d62
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'src/core/surface_factory_qt.h')
| -rw-r--r-- | src/core/surface_factory_qt.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/surface_factory_qt.h b/src/core/surface_factory_qt.h index 28a377e2c..78ccbf2e2 100644 --- a/src/core/surface_factory_qt.h +++ b/src/core/surface_factory_qt.h @@ -42,7 +42,7 @@ #ifndef SURFACE_FACTORY_QT #define SURFACE_FACTORY_QT -#if defined(USE_OZONE) +#if defined(USE_OZONE) || defined(OS_ANDROID) #include "ui/gfx/ozone/surface_factory_ozone.h" |