Eike Ziller 767f0ef58b Merge remote-tracking branch 'origin/3.3' into 3.4 ...

Conflicts:
	doc/api/coding-style.qdoc

Change-Id: Id40eb253a2e3e2357276ee76085127da10597bdb

2015-02-25 10:15:28 +01:00

..

cplusplus

Update License

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

debugger

Debugger: Add dumpers for QPolygon{,F} and QGraphicsPolygonItem

2015-02-24 14:48:33 +00:00

designer

Fixes: Implement make install target, Step 1

2009-01-21 08:52:19 +01:00

generic-highlighter

Editor: Fix highlighting of xml values.

2014-11-28 07:16:14 +01:00

glsl

Update License

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

qml

Fix assert for m_objectInstanceHash

2015-02-23 11:52:49 +00:00

qml-type-descriptions

qmljs: update import completion list

2014-05-17 13:28:01 +02:00

qmldesigner

Merge remote-tracking branch 'origin/3.3'

2015-02-12 17:36:29 +01:00

qmlicons

PNG: Fix warning about sRGB information

2013-05-27 16:12:01 +02: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

Place each statement of default snippets on their own line.

2014-11-14 11:35:33 +01:00

styles

Rename 'vim (dark)' color scheme to 'Dark'

2014-09-01 10:41:12 +02:00

templates

JsonWizard: Allow for descriptions of wizards

2015-02-24 14:56:21 +00:00

themes

Find widget: Give feedback to user about whether search has succeeded.

2015-02-17 10:28:11 +00:00

translations

Update License

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

welcomescreen

Merge remote-tracking branch 'origin/3.3' into 3.4

2015-02-25 10:15:28 +01:00

static.pro

Fix a typo in share/qtcreator/static.pro

2015-01-08 04:44:11 +01:00