Eike Ziller fe74a9a722 Merge remote-tracking branch 'origin/2.6' ...

Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/fakevim/fakevimhandler.cpp
	src/plugins/qtsupport/baseqtversion.cpp
	tests/auto/cplusplus/cxx11/cxx11.pro
	tests/auto/cplusplus/cxx11/tst_cxx11.cpp
	tests/auto/icheckbuild/icheckbuild.pro

Change-Id: I3c8351ad35617f56d15b788c8a46d8a6f453ef70

2012-11-09 11:20:10 +01:00

..

designer

Fixes: Implement make install target, Step 1

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

dumper

debugger: implement pretty printing for D arrays (gdc compiled)

2012-10-21 20:24:34 +02:00

generic-highlighter

Add AutotoolsProjectManager plugin

2011-11-30 14:16:12 +01:00

glsl

Adjust license headers

2012-10-05 17:12:56 +02:00

qml

QmlDesigner.puppet: licence header fix

2012-11-06 15:43:07 +01:00

qml-type-descriptions

QmlJS: Update builtins from Qt 5.

2011-12-08 14:23:01 +01:00

qmldesigner/propertyeditor

Adjust license headers

2012-10-05 17:12:56 +02: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

"Open Terminal Here" should open Terminal.app on Mac.

2011-04-27 15:30:26 +02:00

snippets

Snippets: Add 'switch' trigger for C++ code snippets

2011-10-06 16:46:18 +02:00

styles

CppHighlighter: highlight all functions/methods.

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

templates

Merge remote-tracking branch 'origin/2.6'

2012-10-29 15:13:06 +01:00

translations

Update Polish translations

2012-10-30 12:01:30 +01:00

welcomescreen

Fix remaining URLs and a few other things that still referred Nokia

2012-10-09 11:10:50 +02:00

static.pro

Introduce $$QTC_PREFIX

2012-09-25 10:14:51 +02:00