Merge remote-tracking branch 'qt/5.6' into 5.7 (ae9bfd29) · Commits · CodeLinaro / le / external / qtwayland · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

Q

qtwayland
- Activity
- Members
- Wiki
- Terraform modules

Snippets Groups Projects

ae9bfd29

Commit ae9bfd29 authored 8 years ago by Paul Olav Tvete

Downloads
- Plain Diff

Merge remote-tracking branch 'qt/5.6' into 5.7

Change-Id: I6784a53fcc2f0f68b8e916181cb8cdef263782b8

parents e23550aa f2124674

No related branches found

No related tags found

No related merge requests found

Changes 4

Hide whitespace changes

Inline Side-by-side

Showing

src/client/qwaylanddisplay.cpp 10 additions, 7 deletions

src/client/qwaylanddisplay.cpp
src/client/qwaylandwindow.cpp 5 additions, 0 deletions

src/client/qwaylandwindow.cpp
src/client/qwaylandwindow_p.h 2 additions, 0 deletions

src/client/qwaylandwindow_p.h
src/client/qwaylandwlshellsurface.cpp 9 additions, 1 deletion

src/client/qwaylandwlshellsurface.cpp

with 26 additions and 8 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment