Eike Ziller ee8bf341c6 Merge remote-tracking branch 'origin/4.0' ...

Conflicts:
	src/plugins/projectexplorer/session.cpp
	src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp

Change-Id: I6946139f5e5fa3a9cdbb322fd50be248e2c0133f

2016-04-20 14:58:48 +02:00

..

accelbubble

Update License according to agreement with Free Qt Foundation

2016-01-19 13:09:03 +00:00

textfinder

Wholesale conversion to #pragma once

2016-03-30 15:20:19 +00:00

transitions

Doc: update the Transitions example

2016-04-20 11:23:48 +00:00

uiforms

Update License according to agreement with Free Qt Foundation

2016-01-19 13:09:03 +00:00