Eike Ziller 646c7860cb Merge remote-tracking branch 'origin/4.11' ...

Conflicts:
	src/plugins/genericprojectmanager/genericprojectplugin.cpp
	src/plugins/projectexplorer/environmentaspect.cpp
	src/plugins/projectexplorer/environmentaspect.h
	src/plugins/projectexplorer/environmentaspectwidget.cpp

Change-Id: Id21d62cf14419febd1e06c9b429fcdf4501c0eaf

2019-11-11 12:58:11 +01:00

..

commands

QmlDesigner: Define explicit values for enum class

2019-11-01 08:38:09 +00:00

container

QmlDesigner: Avoid reflection when setting values from puppet

2019-10-30 09:46:35 +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

QmlDesigner: Add and dispatch ValuesModifiedCommand

2019-10-21 12:47:28 +00:00

interfaces

QmlDesigner: Add and dispatch ValuesModifiedCommand

2019-10-21 12:47:28 +00:00

mockfiles

QmlDesigner: Implement camera frustum visualization for edit 3D

2019-11-11 08:44:16 +00:00

qml2puppet

Merge remote-tracking branch 'origin/4.11'

2019-11-11 12:58:11 +01:00

qmlprivategate

Some clang-tidy -use-modernize-nullptr

2019-08-01 13:20:26 +00:00

types

QmlDesigner: reduce enumeration to header only

2019-08-07 14:48:04 +00:00

qmlpuppet_utilities.pri

QmlDesigner.NodeInstances: Move qmlpuppet to share

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

qmlpuppet.qrc

QmlDesigner: Add planar move and scale handles to gizmos

2019-11-08 12:54:06 +00:00