Commit 16c2ee1b authored by Eike Ziller's avatar Eike Ziller

Merge origin/2.8 into 3.0

Conflicts:
	src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp

Change-Id: I1028a14230b9dea0cdb68068469a96e8ddb78754
parents 8f00f261 a6d6db33
Markdown is supported
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