Eike Ziller 98257617e9 Merge remote-tracking branch 'origin/3.6' ...

Conflicts:
	src/plugins/clangcodemodel/clangassistproposalmodel.cpp
	src/plugins/clangcodemodel/clangassistproposalmodel.h

Change-Id: Iba30d2f4d95fa0f551afe58890d15f5835dfb715

2016-01-19 16:41:17 +01:00

..

commands

Qt Quick Designer: License change to Qt Commercial + GPLv3

2015-09-18 12:12:57 +00:00

container

Qt Quick Designer: License change to Qt Commercial + GPLv3

2015-09-18 12:12:57 +00:00

html

QmlDesigner.NodeInstances: Move qmlpuppet to share

2011-06-22 18:24:36 +02:00

images

PNG: Run pngcrush on images with iCCP or sRGB profiles

2015-07-03 09:50:46 +00:00

instances

Convert to Qt5 style connects

2015-11-19 16:22:52 +00:00

interfaces

Qt Quick Designer: License change to Qt Commercial + GPLv3

2015-09-18 12:12:57 +00:00

mockfiles

QmlDesigner.Puppet: Adding size hints to Window mockup

2014-09-09 10:38:07 +02:00

qml2puppet

Merge remote-tracking branch 'origin/3.6'

2016-01-19 16:41:17 +01:00

qmlprivategate

QmlDesigner: Adding layouts to doResetProperty()

2015-10-06 10:16:20 +00:00

types

Qt Quick Designer: License change to Qt Commercial + GPLv3

2015-09-18 12:12:57 +00:00

qmlpuppet_utilities.pri

QmlDesigner.NodeInstances: Move qmlpuppet to share

2011-06-22 18:24:36 +02:00

qmlpuppet.qrc

QmlDesigner: read window mock from file

2014-07-30 13:44:01 +02:00