Eike Ziller 847787f146 Merge remote-tracking branch 'origin/4.7' ...

Conflicts:
	src/plugins/debugger/debuggerruncontrol.cpp

Change-Id: I72882df605bc3fc8a8d20118fd4e49207ac92664

2018-08-07 09:42:02 +02:00

..

cplusplus

Clang: Support old-style SIGNAL/SLOT macro

2018-05-03 13:34:21 +00:00

debugger

Debugger: Make LLDB instruction-wise stepping work with 3.8.1

2018-07-24 12:45:01 +00:00

glsl

Update License according to agreement with Free Qt Foundation

2016-01-19 16:05:29 +00:00

modeleditor

ModelEditor: Add Deployment diagrams

2018-01-09 14:23:43 +00:00

qml/qmlpuppet

QmlDesigner: Fix clazy warning

2018-08-01 14:38:47 +00:00

qml-type-descriptions

qmljs: Add autocompletion for QtWebEngine imports

2018-07-04 06:34:32 +00:00

qmldesigner

QmlDesigner: Adjust some margins and sizes

2018-05-17 18:18:38 +00:00

qmlicons

PNG: Run pngcrush on images with iCCP or sRGB profiles

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

schemes

Change the shortcut for ui form preview

2010-08-25 11:57:02 +02:00

scripts

consoleprocess: support Terminal.app on mac

2013-01-29 17:56:59 +01:00

snippets

Snippets: Add snippet for namespace with closing comment

2018-03-13 10:17:12 +00:00

styles

Add old default text style as Default Classic

2017-06-20 16:00:09 +00:00

templates

Update CMake template for console projects to newer standards

2018-07-19 07:45:18 +00:00

themes

Utils: remove Clang from ClangCodeModel_*_TextMarkColor

2018-05-17 05:55:53 +00:00

translations

Improve Russian translation

2018-08-03 14:27:09 +00:00

welcomescreen

Welcome: Move worldsummit16.png to plugins/qtsupport

2017-02-28 09:37:43 +00:00

static.pro

Welcome: Start some performance improvements

2017-01-13 15:38:14 +00:00