Commit 93e0c9cb authored by Paolo Angelelli's avatar Paolo Angelelli
Browse files

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

Conflicts:
	tests/auto/declarative_ui/tst_map.qml

Change-Id: If408b8242b39f78926b5373393f3b1f65b262499
parents 677f7f76 c832af78
Branches
Tags
Showing with 1025 additions and 235 deletions
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