Eike Ziller a98fe15fe5 Merge remote-tracking branch 'origin/2.8' into HEAD ...

Conflicts:
	qbs/pluginspec/pluginspec.qbs

Change-Id: Ic8e992623b9eda8913ee473c779a8df27643ccc9

2013-07-08 15:01:17 +02:00

..

designer

Fixes: Implement make install target, Step 1

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

dumper

Debugger: Fix LLDB display of std::array with "complex" content

2013-07-08 13:15:20 +02:00

generic-highlighter

Git: Provide a real highlighter for interactive rebase

2013-06-03 10:40:32 +02:00

glsl

Incremented year in copyright info

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

qml

Merge remote-tracking branch 'origin/2.8' into HEAD

2013-07-08 15:01:17 +02:00

qml-type-descriptions

Add missing QtQuick.Controls/Dialogs/Layouts type descriptions

2013-05-27 17:57:36 +02:00

qmldesigner/propertyeditor

QmlDesigner.PropertyEditor: Add generic QtObject pane

2013-06-05 12:05:33 +02: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

add $type$ variable to Q_PROPERTY cpp snippet

2013-03-27 09:11:02 +01:00

styles

DiffEditor: Fix name for style constant

2013-07-03 07:42:12 +02:00

templates

Wizards: remove escaped HMTL

2013-06-26 13:49:41 +02:00

translations

Russian translation update

2013-07-03 18:12:20 +02:00

welcomescreen

Make Qt version combo box on welcome screen wider

2013-06-11 14:36:28 +02:00

static.pro

Fix sources that are deployed into Qt Creator build for qml(2)puppet

2013-06-28 14:22:36 +02:00