Eike Ziller bac2e6c17a Merge remote-tracking branch 'origin/4.3' ...

Conflicts:
	src/plugins/cmakeprojectmanager/servermodereader.cpp

Change-Id: I58e7b33d32c41cb48a24a5638ddb256212dd6107

2017-03-30 13:59:12 +02:00

..

cplusplus/wrappedQtHeaders/QtCore

Clang: Fix tagging of slots with CONFIG+=no_keywords

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

debugger

Debugger: Use native value for pointer dereference

2017-03-28 09:22:28 +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: Fix warning

2017-03-23 17:00:42 +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: Fix drag and drop

2017-03-24 11:21:42 +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: Add missing CMake build system to wizard

2017-03-21 14:07:00 +00:00

themes

Locator: Add highlighting of the search text

2017-03-21 12:31:46 +00:00

translations

Merge remote-tracking branch 'origin/4.2'

2017-01-30 10:55:40 +01: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