Skip to content
GitLab
Commit b07a7d79 authored by Qt Forward Merge Bot's avatar Qt Forward Merge Bot
Browse files

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

 Conflicts:
	.qmake.conf

Change-Id: Ie0a7534d518cd5758119edc77d8275ac3da2037c
parents 1057d6a8 c296df78
dev 5.13 5.13.0 5.13.1 5.13.2 5.14 5.14.0 5.14.1 5.14.2 5.15 5.15.0 5.15.1 5.15.2 6.2 6.2.0 6.2.1 6.2.2 wip/cmake wip/qt6 v5.15.0-alpha1 v5.14.1 v5.14.0 v5.14.0-rc2 v5.14.0-rc1 v5.14.0-beta3 v5.14.0-beta2 v5.14.0-beta1 v5.14.0-alpha1 v5.13.2 v5.13.1 v5.13.0 v5.13.0-rc3 v5.13.0-rc2 v5.13.0-rc1 v5.13.0-beta4 v5.13.0-beta3 v5.13.0-beta2
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 7 additions and 2 deletions
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment