Eike Ziller ec231b5910 Merge remote-tracking branch 'origin/4.0' ...

Conflicts:
	src/plugins/valgrind/valgrindruncontrolfactory.cpp

Change-Id: I96c0f8cc3b49f8f55f45ef1f839857f878f532f4

2016-05-18 12:12:46 +02:00

..

cplusplus/wrappedQtHeaders/QtCore

Update License according to agreement with Free Qt Foundation

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

debugger

Merge remote-tracking branch 'origin/4.0'

2016-05-13 16:24:37 +02: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: do no refresh if there is no parent

2016-04-29 08:06:40 +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: 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

Merge remote-tracking branch 'origin/4.0'

2016-05-09 16:37:41 +02:00

themes

Theme: Separate run/stop/interrupt icons in menus

2016-04-21 15:57:56 +00:00

translations

Merge remote-tracking branch 'origin/4.0'

2016-05-18 12:12:46 +02:00

welcomescreen

WelcomeScreen: QImageProvider fix

2016-04-14 07:38:11 +00:00

static.pro

Move 3rdparty resources into 3rdparty subdirectory

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