Eike Ziller 9142934d8e Merge remote-tracking branch 'origin/4.0' into 4.1 ...

Conflicts:
	share/qtcreator/templates/wizards/classes/itemmodel/listmodel.cpp
	src/plugins/debugger/debuggerruncontrol.cpp

Change-Id: I0ece46a7df3b5a6e045b30db60e608212a40cc4d

2016-08-15 14:34:25 +02:00

..

qt4project

Qt Designer custom widget wizard: Write plugins compatible with Qt 4 / 5.

2013-02-13 13:45:43 +01:00

wizards

Merge remote-tracking branch 'origin/4.0' into 4.1

2016-08-15 14:34:25 +02:00