Oswald Buddenhagen e426d08e54 Merge remote-tracking branch 'origin/4.0' ...

Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/debugger/debuggerruncontrol.cpp

Change-Id: I81b43480a1369e3d7be60ae26e812dda6b962b0b

2016-04-01 17:31:39 +02:00

..

cplusplus/wrappedQtHeaders/QtCore

Update License according to agreement with Free Qt Foundation

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

debugger

Dumper: Fix fileName offset for Qt5.5 on 32bit

2016-03-31 05:29:47 +00:00

generic-highlighter

GenericHighlighter: Update from latest KTextEditor source

2016-03-14 08:34:33 +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

Wholesale conversion to #pragma once

2016-03-30 15:20:19 +00:00

qml-type-descriptions

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

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

qmldesigner

QmlDesigner: HighDpi fixes for some graphics

2016-02-10 14:07:12 +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

TextEditor: Add global variable text styles

2016-03-07 12:07:38 +00:00

templates

Wholesale conversion to #pragma once

2016-03-30 15:20:19 +00:00

themes

Dark theme: make "changed variable" text color in watch window readable

2016-03-23 11:55:10 +00:00

translations

Update Russian translation

2016-03-30 16:28:47 +00:00

welcomescreen

WelcomeScreen: little adjustments for default.creatortheme

2016-03-18 15:40:00 +00:00

static.pri

Use variables for install locations

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

static.pro

Remove QmlDump source

2016-02-02 12:20:17 +00:00