Eike Ziller c175f1e62f Merge remote-tracking branch 'origin/4.2' ...

Conflicts:
	src/plugins/ios/iosdevice.cpp
	src/plugins/ios/iossimulator.cpp
	src/plugins/projectexplorer/projectwindow.cpp
	src/plugins/qmakeprojectmanager/librarydetailscontroller.cpp
	src/shared/qbs

Change-Id: Ie98e2401a2259903141a13170c78388f2da467d2

2016-12-09 12:42:01 +01: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.2'

2016-12-09 12:42:01 +01: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: Fixing double free

2016-11-30 08:29:25 +00:00

qml-type-descriptions

Update QQC2 imports in qt5QtQuick2-bundle.json for Qt 5.8

2016-11-16 16:15:16 +00:00

qmldesigner

Fix double space

2016-11-16 07:13:52 +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

QmlDesigner: Removing wizards for QtQuick.Controls 1

2016-11-30 15:21:32 +00:00

themes

Fix readability of TODO entries on dark themes

2016-11-14 14:00:49 +00:00

translations

Fix string in German translation

2016-11-30 12:37:22 +00:00

welcomescreen

Fix that files could not be dropped onto welcome screen

2016-11-16 06:50:53 +00:00

static.pro

Move 3rdparty resources into 3rdparty subdirectory

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