Commit 3fd3ffad authored by Liang Qi's avatar Liang Qi
Browse files

Merge remote-tracking branch 'origin/5.4' into 5.5

Conflicts:
	qtactiveqt.pro

Change-Id: Ie6deaadc8cf69e111a0ae7ebef420b4f47e3b9a3
parents ed8d0964 70c22cb8
No related merge requests found
Showing with 23 additions and 1 deletion
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