Eike Ziller 0b10ecc718 Merge remote-tracking branch 'origin/4.6' ...

Conflicts:
	src/plugins/cmakeprojectmanager/cmakeproject.h
	src/plugins/debugger/debuggerplugin.cpp
	src/plugins/ios/iosrunfactories.cpp
	src/plugins/nim/project/nimproject.h
	src/plugins/qbsprojectmanager/qbsrunconfiguration.cpp
	src/plugins/qmakeandroidsupport/qmakeandroidrunfactories.cpp
	src/plugins/qmakeprojectmanager/desktopqmakerunconfiguration.cpp
	src/plugins/qmlprojectmanager/qmlproject.h
	src/plugins/qnx/qnxrunconfigurationfactory.cpp
	src/plugins/qtsupport/exampleslistmodel.cpp
	src/plugins/winrt/winrtrunfactories.cpp

Change-Id: Ib029fdbaa65270426332f5edd6e90264be5fb539

2018-03-13 11:25:38 +01: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

QmlDesigner: Add meta hint if item renders children directly

2018-03-09 15:05:22 +00: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