Oswald Buddenhagen 0164e1bea2 Merge branch '2.3' into 2.4 ...

Conflicts:
	src/plugins/debugger/commonoptionspage.ui
	src/plugins/madde/maemoqtversion.cpp
	src/plugins/projectexplorer/runsettingspropertiespage.ui

Change-Id: Ieccda73ddca22f9a2d41351619cb682b06d9bfcf

2011-10-18 13:50:38 +02:00

..

designer

Fixes: Implement make install target, Step 1

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

dumper

debugger: more robust Qt 4 vs Qt 5 detection in dumper

2011-10-17 10:26:45 +02:00

generic-highlighter

Add valgrind suppression syntax highlighting file.

2011-03-04 12:33:37 +01:00

glsl

Replace qt-info@nokia.com with info@qt.nokia.com

2011-07-06 11:14:01 +02:00

patches

Changed links to bugtracker to https

2011-08-10 13:44:03 +02:00

qml

QmlDesigner.instances: support for QMLDESIGNER_RC_PATHS

2011-10-05 17:17:48 +02:00

qml-type-descriptions

QmlJS: Update builtins.qmltypes from Qt 5.

2011-10-12 08:43:04 +02:00

qmldesigner/propertyeditor

QmlDesigner.propertyEditor: fix caption for BorderImage

2011-10-18 13:30:11 +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

Qml snippets: Improve NumberAnimation and PropertyAction.

2011-10-05 09:07:29 +02:00

styles

Editors: Change Link color from inkpot scheme

2011-06-08 16:32:03 +02:00

templates

Harmattan: Support "no Aegis manifest file" case.

2011-10-13 17:46:25 +02:00

translations

Merge branch '2.3' into 2.4

2011-10-18 13:50:38 +02:00

welcomescreen

WelcomeScreen: Use ListView instead of Repeater for news

2011-10-10 17:38:30 +02:00

static.pro

Provide qmlviewer in external tools menu

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