Eike Ziller 42f4595e37 Merge remote-tracking branch 'origin/2.5' ...

Conflicts:
	src/libs/cplusplus/cplusplus-lib.pri

Change-Id: I430ec8c6dda4afad3aedb1bc47d3af64537cfe66

2012-07-24 14:17:33 +02:00

..

designer

Fixes: Implement make install target, Step 1

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

dumper

debugger: fix display of member function pointers

2012-07-19 15:01:26 +02:00

generic-highlighter

Add AutotoolsProjectManager plugin

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

glsl

Contact -> qt-project.org

2012-07-19 13:23:21 +02:00

qml

Contact -> qt-project.org

2012-07-19 13:23:21 +02:00

qml-type-descriptions

QmlJS: Update builtins from Qt 5.

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

qmldesigner/propertyeditor

Contact -> qt-project.org

2012-07-19 13:23:21 +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

Contact -> qt-project.org

2012-07-19 13:23:21 +02:00

translations

Merge remote-tracking branch 'origin/2.5'

2012-07-24 14:17:33 +02:00

welcomescreen

Contact -> qt-project.org

2012-07-19 13:23:21 +02:00

static.pro

static: List shared files in project tree

2012-05-24 20:20:35 +02:00