diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2017-02-27 12:10:30 +0100 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2017-02-27 18:32:36 +0000 |
| commit | 2c9acfbec667878ce913fecda6361e7150b3a778 (patch) | |
| tree | 4f730498e405e0c5084d946760d5dd8ae7ffbe8b /src/gui | |
| parent | 7a717aaf459476f4a1f091b0e1d832c592f2caf1 (diff) | |
Enable QWindowContainer on Android
[ChangeLog][Platform Specific Changes][Android] QWidget::createWindowContainer()
is now supported on Android for embedding OpenGL-based QWindows into widget UIs.
Task-number: QTBUG-59175
Change-Id: I84d3703bcd44c63b1fdfe6772b7f3de9d5c18ddf
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Reviewed-by: BogDan Vatra <bogdan@kdab.com>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/kernel/qplatformintegration.cpp | 7 | ||||
| -rw-r--r-- | src/gui/kernel/qplatformintegration.h | 3 |
2 files changed, 8 insertions, 2 deletions
diff --git a/src/gui/kernel/qplatformintegration.cpp b/src/gui/kernel/qplatformintegration.cpp index fe1861e08b..0af3295430 100644 --- a/src/gui/kernel/qplatformintegration.cpp +++ b/src/gui/kernel/qplatformintegration.cpp @@ -237,6 +237,10 @@ QPlatformServices *QPlatformIntegration::services() const is required to have this capability. \value ApplicationIcon The platform supports setting the application icon. (since 5.5) + + \value TopStackedNativeChildWindows The platform supports native child windows via + QWindowContainer without having to punch a transparent hole in the + backingstore. (since 5.10) */ /*! @@ -260,7 +264,8 @@ QPlatformServices *QPlatformIntegration::services() const bool QPlatformIntegration::hasCapability(Capability cap) const { - return cap == NonFullScreenWindows || cap == NativeWidgets || cap == WindowManagement; + return cap == NonFullScreenWindows || cap == NativeWidgets || cap == WindowManagement + || cap == TopStackedNativeChildWindows; } QPlatformPixmap *QPlatformIntegration::createPlatformPixmap(QPlatformPixmap::PixelType type) const diff --git a/src/gui/kernel/qplatformintegration.h b/src/gui/kernel/qplatformintegration.h index 466b3348bd..29f7b9b3a6 100644 --- a/src/gui/kernel/qplatformintegration.h +++ b/src/gui/kernel/qplatformintegration.h @@ -99,7 +99,8 @@ public: RasterGLSurface, AllGLFunctionsQueryable, ApplicationIcon, - SwitchableWidgetComposition + SwitchableWidgetComposition, + TopStackedNativeChildWindows }; virtual ~QPlatformIntegration() { } |