summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohan Klokkhammer Helsing <johan.helsing@qt.io>2017-06-02 14:39:49 +0200
committerJohan Helsing <johan.helsing@qt.io>2017-06-13 07:43:01 +0000
commit8e3518c0afbca915d4ec1daded13e6c4f95f3231 (patch)
tree7a3d29a662e910597e4c5942add6e7946353f794
parent4934b87156a889584a34e36c22abd9aee64cef7e (diff)
Fix missing rename from waylandDisplay to display
QWaylandCompositor::waylandDisplay was previously renamed to display, but the libhybris implementation was not updated. Task-number: QTBUG-61183 Change-Id: I80cacb7eeef93375bebd159b676db1147914e8de Reviewed-by: Jan Arne Petersen <jan.petersen@kdab.com> Reviewed-by: Pier Luigi Fiorini <pierluigi.fiorini@liri.io>
-rw-r--r--src/hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.cpp b/src/hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.cpp
index e4bfe27dc..2312a468b 100644
--- a/src/hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.cpp
+++ b/src/hardwareintegration/compositor/libhybris-egl-server/libhybriseglserverbufferintegration.cpp
@@ -172,7 +172,7 @@ void LibHybrisEglServerBufferIntegration::initializeHardware(QWaylandCompositor
return;
}
- QtWaylandServer::qt_libhybris_egl_server_buffer::init(compositor->waylandDisplay(), 1);
+ QtWaylandServer::qt_libhybris_egl_server_buffer::init(compositor->display(), 1);
}
bool LibHybrisEglServerBufferIntegration::supportsFormat(QtWayland::ServerBuffer::Format format) const