Eike Ziller b299ff19ec Merge remote-tracking branch 'origin/4.2' ...

Conflicts:
	src/shared/qbs

Change-Id: Ic39fd1c411632f56312fae31c0c88ebc1098b5a4

2017-01-30 10:55:40 +01:00

..

cplusplus/wrappedQtHeaders/QtCore

Clang: Fix tagging of slots with CONFIG+=no_keywords

2017-01-03 16:47:12 +00:00

debugger

Debugger: Replace common qint typedefs before type lookup

2017-01-30 08:30:41 +00:00

glsl

Update License according to agreement with Free Qt Foundation

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

modeleditor

ModelEditor: Define syntax of custom definitions like QML

2016-01-05 15:02:58 +00:00

qml/qmlpuppet

QmlDesigner: Fixing double free

2016-11-30 08:29:25 +00:00

qml-type-descriptions

Update QQC2 imports in qt5QtQuick2-bundle.json for Qt 5.8

2016-11-16 16:15:16 +00:00

qmldesigner

QmlDesigner: Polish expression editor for when condition

2017-01-11 13:51:15 +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

Update License according to agreement with Free Qt Foundation

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

styles

Qt Creator Dark text color scheme: Fix #d64564

2016-08-02 21:49:12 +00:00

templates

AutoTest: Enhance wizard to support Qbs

2017-01-26 13:51:38 +00:00

themes

Fix readability of TODO entries on dark themes

2016-11-14 14:00:49 +00:00

translations

Merge remote-tracking branch 'origin/4.2'

2017-01-30 10:55:40 +01:00

welcomescreen

Welcome: Add a video tutorial image

2017-01-26 17:47:08 +00:00

static.pro

Welcome: Start some performance improvements

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