src/client/qwaylandscreen_p.h · cddeb1c7c0e9d02c5f5542d7d12b4fa992bfb050 · BC / public / external / Qt / QtWayland

GitLab now enforces expiry dates on tokens that originally had no set expiration date. Those tokens were given an expiration date of one year later. Please review your personal access tokens, project access tokens, and group access tokens to ensure you are aware of upcoming expirations. Administrators of GitLab can find more information on how to identify and mitigate interruption in our documentation.

Blame History

Merge remote-tracking branch 'origin/5.6' into 5.7 · cddeb1c7

Liang Qi authored Jun 30, 2016

Conflicts:
	src/client/qwaylandinputcontext_p.h
	src/hardwareintegration/client/brcm-egl/qwaylandbrcmglcontext.h
	src/hardwareintegration/client/wayland-egl/qwaylandglcontext.h
	src/hardwareintegration/client/xcomposite-glx/qwaylandxcompositeglxcontext.h

Change-Id: Iac517e1985e4e67d7ca00ca4c10dcda9dd9079f9

cddeb1c7

Admin message