Eike Ziller f60873a24f Merge remote-tracking branch 'origin/2.7' ...

Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: Ie71d0d5aebdd1406d94de348bcd4cfcc203a1ba9

2013-03-08 11:39:33 +01:00

..

designer

Fixes: Implement make install target, Step 1

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

dumper

Debugger: Fix or disable remaining dumper auto tests

2013-02-13 16:00:01 +01:00

generic-highlighter

Update generic highlighter definitions

2013-02-09 18:24:32 +01:00

glsl

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

qml

Merge remote-tracking branch 'origin/2.7'

2013-03-08 11:39:33 +01:00

qml-type-descriptions

qmljs: add infrastructure handling qml dialects better

2013-02-21 17:22:16 +01:00

qmldesigner/propertyeditor

Incremented year in copyright info

2013-02-01 09:19:26 +01:00

qmlicons

QmlEditor.outline: adding icons for Extra Components

2011-05-06 13:14:44 +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

Editor: Add snippet for main function

2013-02-19 01:25:13 +01:00

styles

CppHighlighter: highlight all functions/methods.

2012-06-05 09:30:54 +02:00

templates

fix syntax errors in qmlproject files

2013-02-25 12:15:51 +01:00

translations

Russian translation update

2013-03-04 18:09:39 +01:00

welcomescreen

Welcomepage: fix combobox for Qt 4

2013-03-04 17:51:40 +01:00

static.pro

Add qmlscene to external tools menu

2012-12-17 14:53:53 +01:00