Eike Ziller 428fcb476b Merge remote-tracking branch 'origin/4.6' ...

Conflicts:
	src/libs/utils/settingsaccessor.cpp
	src/plugins/autotest/autotestplugin.cpp
	src/plugins/git/gitclient.cpp
	src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
	src/plugins/qbsprojectmanager/qbsrunconfiguration.h

Change-Id: I65f143cad18af509a2621d6c5925abbd038ea70f

2018-04-13 10:54:42 +02:00

..

commands

Use qEnvironmentVariableIsEmpty or qEnvironmentVariableIsSet directly

2017-04-19 08:00:14 +00:00

container

Fix compile

2018-03-09 15:37:37 +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: Remove unused member

2017-06-07 10:13:58 +00:00

interfaces

QmlDesigner: Add logging to NodeInstanceView

2017-03-01 16:20:48 +00:00

mockfiles

QmlDesigner: Remove QtQuick.Controls 1.0 dependcy from Window mockup

2017-07-20 13:34:34 +00:00

qml2puppet

Merge remote-tracking branch 'origin/4.6'

2018-04-13 10:54:42 +02:00

qmlprivategate

Merge remote-tracking branch 'origin/4.6'

2018-03-01 15:46:37 +01:00

types

QmlDesigner: Avoid detachs

2018-01-23 10:14:12 +00:00

qmlpuppet_utilities.pri

QmlDesigner.NodeInstances: Move qmlpuppet to share

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

qmlpuppet.qrc

QmlDesigner: Replace SwipeView with StackLayout

2017-05-15 15:50:48 +00:00