Eike Ziller 07fccfe9f1 Merge remote-tracking branch 'origin/master' into 4.1 ...

Change-Id: I56399e6938a5f5096c0b1a1561a54d34a5c96330

2016-06-27 11:40:35 +02:00

..

cplusplus/wrappedQtHeaders/QtCore

Update License according to agreement with Free Qt Foundation

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

debugger

Debugger: Remove debuggerstringutils.h

2016-06-09 08:09:46 +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 url

2016-06-22 13:17:05 +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: Adding tool tips for anchoring

2016-06-22 15:53:02 +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

Modnokai Night Shift v2 color scheme for QtC Text Editor

2016-06-23 18:34:58 +00:00

templates

AutoTest: Use json based wizard

2016-06-23 10:10:23 +00:00

themes

Theming: Set flat flag on flat themes

2016-06-21 15:28:48 +00:00

translations

qbs build: Introduce new module "qtc".

2016-06-08 08:46:00 +00: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