Merge remote-tracking branch 'origin/5.8' into dev (3c6d1f97) · Commits · BC / public / external / Qt / QtAndroidExtras · GitLab

Snippets Groups Projects

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.

Commit 3c6d1f97 authored 9 years ago by

Liang Qi

Merge remote-tracking branch 'origin/5.8' into dev

Conflicts:
	.qmake.conf

Change-Id: Ia3e6cc1426587473c7079c0b20e76cfbd31cfeea

parents 9f8b2a6e 8bd0a0e5

No related merge requests found

Expand all Hide whitespace changes

Inline Side-by-side

Showing with 2 additions and 1689 deletions

Please register or to comment