Eike Ziller d13b22e6bc Merge remote-tracking branch 'origin/3.6' ...

Conflicts:
	src/plugins/coreplugin/editormanager/editormanager.cpp

Change-Id: Ibdf433b54e36e58182b7094f78d47ed3e8c81684

2015-11-12 13:43:17 +01:00

..

cplusplus/wrappedQtHeaders/QtCore

Clang: Free us from specific Qt versions

2015-07-27 13:12:41 +00:00

debugger

Debugger: Adjust QFileInfo dumper for Qt 5.7 on Linux 32 bit

2015-11-11 13:57:37 +00:00

generic-highlighter

GenericHighlighter: Update built-in definitions

2015-06-10 07:20:36 +00:00

glsl

Update License

2015-01-16 12:37:56 +01:00

modeleditor

Add new ModelEditor plugin.

2015-09-16 12:13:36 +00:00

qml

QmlDesigner: Adding layouts to doResetProperty()

2015-10-06 10:16:20 +00:00

qml-type-descriptions

Add QML import completion for Qt.labs.controls, calendar & templates

2015-11-02 13:16:36 +00:00

qmldesigner

Qt Quick Designer: License change to Qt Commercial + GPLv3

2015-09-18 12:12:57 +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 license snippets

2015-10-19 08:43:27 +00:00

styles

TextEdit: Add underline support to text settings

2015-09-10 13:40:04 +00:00

templates

Wizards: Fix qmlproject wizards again

2015-10-28 12:13:37 +00:00

themes

Utils: New ThemeHelper class with icon handling tools

2015-10-23 16:08:32 +00:00

translations

Update Russian translation

2015-11-06 15:28:56 +00:00

welcomescreen

Welcome: link to talks from Qt World Summit

2015-10-28 12:10:50 +00:00

static.pri

Use variables for install locations

2015-09-22 12:16:08 +00:00

static.pro

Static.pro: Remove unnecessary evals

2015-09-22 12:16:16 +00:00