Eike Ziller 078d570721 Merge remote-tracking branch 'origin/2.5' ...

Conflicts:
	share/share.qbs

Change-Id: Ia64573d1a69b9063fee32496a3f0a00926a3dadd

2012-04-03 10:03:52 +02:00

..

designer

Fixes: Implement make install target, Step 1

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

dumper

Merge remote-tracking branch 'origin/2.5'

2012-04-03 10:03:52 +02:00

generic-highlighter

Add AutotoolsProjectManager plugin

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

glsl

Long live the king!

2012-01-26 19:55:36 +01:00

patches

bugreports.qt.nokia.com -> bugreports.qt-project.org

2012-01-26 19:58:08 +01:00

qml

Normalized connect()s

2012-03-06 12:46:52 +01:00

qml-type-descriptions

QmlJS: Update builtins from Qt 5.

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

qmldesigner/propertyeditor

Long live the king!

2012-01-26 19:55:36 +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

"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

Revert "CppHighlighter: highlight all functions/methods."

2012-03-29 15:53:23 +02:00

templates

Html5 app wizard: Adapt to QUrl changes in Qt 4.8.0

2012-03-14 14:53:42 +01:00

translations

Translation: Update and fixed German translations.

2012-03-19 16:56:17 +01:00

welcomescreen

Merge remote-tracking branch 'origin/2.5'

2012-03-28 16:31:29 +02:00

static.pro

Provide qmlviewer in external tools menu

2011-07-29 16:29:58 +02:00