Eike Ziller 112bdc0f88 Merge remote-tracking branch 'origin/4.1' ...

Conflicts:
	qbs/modules/qtc/qtc.qbs
	qtcreator.pri

Change-Id: Id3be48ea1d00fadbec9a56d721688732118aab28

2016-08-15 14:42:47 +02:00

..

cplusplus/wrappedQtHeaders/QtCore

Update License according to agreement with Free Qt Foundation

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

debugger

Debugger: Fix metaObject extraction logic

2016-08-05 13:01:21 +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

Remove use of deprecated Qt algorithms

2016-08-09 13:41:25 +00:00

qml-type-descriptions

Add QtQuick Controls and Templates 2.0 to qt5QtQuick2-bundle.json

2016-04-27 15:53:57 +00:00

qmldesigner

QmlDesigner: Fix visibility of Origin control

2016-08-05 09:08:45 +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

Merge remote-tracking branch 'origin/4.1'

2016-08-15 14:42:47 +02:00

themes

Timeline: Add some theming

2016-08-05 11:35:35 +00:00

translations

qbs build: Introduce new module "qtc".

2016-06-08 08:46:00 +00:00

welcomescreen

Welcome: Added keyboard hotkeys to open sessions and recent projects

2016-07-28 15:04:55 +00:00

static.pro

Move 3rdparty resources into 3rdparty subdirectory

2016-04-12 12:30:55 +00:00