diff options
author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-11-09 13:27:11 +0100 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-11-09 13:27:12 +0100 |
commit | c69f43594fc921fea82377e7b31a7f55f718051d (patch) | |
tree | 37d30b254f0c24f9588dcb3e8f1b47becdba8ef1 /src/plugins/platforms/windows | |
parent | 9137691e745039f8ad9cdee2594a958e244ba341 (diff) | |
parent | dec7961709c90f6977d2447f7fa6c6625af41cb2 (diff) |
Merge 5.11 into 5.11.3
Change-Id: I9a84ca8038a65daab50b6205bc7e1e3b5b5098aa
Diffstat (limited to 'src/plugins/platforms/windows')
-rw-r--r-- | src/plugins/platforms/windows/qwindowsintegration.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/platforms/windows/qwindowsintegration.cpp b/src/plugins/platforms/windows/qwindowsintegration.cpp index 0a9e8b9d91..66a5c52da5 100644 --- a/src/plugins/platforms/windows/qwindowsintegration.cpp +++ b/src/plugins/platforms/windows/qwindowsintegration.cpp @@ -300,7 +300,7 @@ bool QWindowsIntegration::hasCapability(QPlatformIntegration::Capability cap) co case AllGLFunctionsQueryable: return true; case SwitchableWidgetComposition: - return true; + return false; // QTBUG-68329 QTBUG-53515 QTBUG-54734 default: return QPlatformIntegration::hasCapability(cap); } |