diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-07 01:00:10 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-03-07 01:00:10 +0100 |
| commit | cf00c01f68198f55e0be5de4d9b720a31dea1a21 (patch) | |
| tree | 0d119a5be7ef2a258858ded2b264e96d6cd5a572 /src/gui/kernel | |
| parent | ada1b61991b16f21c5cd9c785dc7fbfa832f18be (diff) | |
| parent | 3eb42abab6c7d1f3a32ca55c972b1d7a4a703658 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I110feec4750bd304975bab4f3f33d3a61a4e08bd
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qplatformintegration.cpp | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qplatformintegration.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/kernel/qplatformintegration.cpp b/src/gui/kernel/qplatformintegration.cpp index 866ce08a28..2aaa4c8510 100644 --- a/src/gui/kernel/qplatformintegration.cpp +++ b/src/gui/kernel/qplatformintegration.cpp @@ -265,7 +265,7 @@ QPlatformServices *QPlatformIntegration::services() const bool QPlatformIntegration::hasCapability(Capability cap) const { return cap == NonFullScreenWindows || cap == NativeWidgets || cap == WindowManagement - || cap == TopStackedNativeChildWindows; + || cap == TopStackedNativeChildWindows || cap == WindowActivation; } QPlatformPixmap *QPlatformIntegration::createPlatformPixmap(QPlatformPixmap::PixelType type) const diff --git a/src/gui/kernel/qplatformintegration.h b/src/gui/kernel/qplatformintegration.h index 37884e1f78..d88f818920 100644 --- a/src/gui/kernel/qplatformintegration.h +++ b/src/gui/kernel/qplatformintegration.h @@ -97,6 +97,7 @@ public: NonFullScreenWindows, NativeWidgets, WindowManagement, + WindowActivation, // whether requestActivate is supported SyncState, RasterGLSurface, AllGLFunctionsQueryable, |