Skip to content
GitLab
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
BC
public
external
Qt
QtWayland
Commits
127e5d5a
Commit
127e5d5a
authored
9 years ago
by
Liang Qi
Browse files
Options
Download
Plain Diff
Merge remote-tracking branch 'origin/5.5' into 5.6
Change-Id: Ib3c5bec85a09d92e37a3af8e1c749a80cb40c056
parents
c6dc4f47
9d408649
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
src/client/qwaylanddisplay.cpp
+2
-0
src/client/qwaylanddisplay.cpp
src/compositor/compositor_api/qwaylandsurfaceitem.cpp
+4
-0
src/compositor/compositor_api/qwaylandsurfaceitem.cpp
src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.cpp
+7
-0
...dwareintegration/client/wayland-egl/qwaylandeglwindow.cpp
src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h
+1
-0
...ardwareintegration/client/wayland-egl/qwaylandeglwindow.h
src/hardwareintegration/compositor/wayland-egl/waylandeglclientbufferintegration.cpp
+11
-6
...positor/wayland-egl/waylandeglclientbufferintegration.cpp
with
25 additions
and
6 deletions
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment
