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 82fdc891 authored 6 years ago by

Liang Qi

Browse files

Merge remote-tracking branch 'origin/5.12' into 5.13

 Conflicts:
	tests/auto/integration/qdeclarativevideooutput/tst_qdeclarativevideooutput.cpp

Done-with: Val Doroshchuk <valentyn.doroshchuk@qt.io>
Change-Id: I745dd948c1e98180115f85c17bef802351bbdb6b

parents f787689e c8716f68

Hide whitespace changes

Inline Side-by-side

Showing with 127 additions and 100 deletions

Please register or to comment

Admin message

Merge remote-tracking branch 'origin/5.12' into 5.13