diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-04-21 09:32:01 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-04-21 09:32:01 +0200 |
| commit | 2e9771ae81597d4c85d8dc103dbf55fe8870764d (patch) | |
| tree | 488bbcac31ffe2dead7a5f6ab16280e9e1f68d0a /src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h | |
| parent | 1d18591d9e7ed9b3580e06c37be23bfde24bc30c (diff) | |
| parent | af3976e5e788392ab2b0299c11036c18493d8d40 (diff) | |
Merge remote-tracking branch 'origin/5.14.2' into 5.145.14
Change-Id: Id1726d5c5392a6b41ff052f1c82ece2a346d24fa
Diffstat (limited to 'src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h')
| -rw-r--r-- | src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h b/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h index 6763d5916..e783d41bf 100644 --- a/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h +++ b/src/hardwareintegration/compositor/xcomposite-glx/xcompositeglxintegration.h @@ -48,7 +48,7 @@ public: XCompositeGLXClientBufferIntegration(); ~XCompositeGLXClientBufferIntegration() override; - bool initializeHardware(struct ::wl_display *display) override; + void initializeHardware(struct ::wl_display *display) override; QtWayland::ClientBuffer *createBufferFor(wl_resource *buffer) override; inline Display *xDisplay() const { return mDisplay; } |