Oswald Buddenhagen ae8ac2eb2f Merge branch '2.3' ...

Conflicts:
	qtcreator.pri
	src/plugins/qmlprojectmanager/qmlprojectruncontrol.cpp
	src/plugins/remotelinux/maemodeploystepfactory.cpp
	src/plugins/remotelinux/maemodirectdeviceuploadstep.cpp

Change-Id: I195163713145e72df20aec4ac9058f0c9158083e

2011-07-25 13:57:13 +02:00

..

designer

…

dumper

Debugger[gdb]: Dump QString and QByteArray of Qt 5.

2011-07-18 12:53:01 +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

debugger: add note which patch to apply for FSF gdb on Mac

2011-07-06 16:22:32 +02:00

qml

Merge branch '2.3'

2011-07-25 13:57:13 +02:00

qml-type-descriptions

Merge branch '2.3'

2011-07-25 13:57:13 +02:00

qmldesigner/propertyeditor

QmlDesigner.propertyEditor: support for line breaks in text edit

2011-07-22 11:51:22 +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

QmlJS: Add qsTr to Text snippet.

2011-06-21 14:32:09 +02:00

styles

Editors: Change Link color from inkpot scheme

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

templates

QmlExtension wizard: Use $$[QT_INSTALL_IMPORTS] for desktop targets

2011-07-20 13:15:57 +02:00

translations

L10n: German translation for 2.3.

2011-07-22 17:18:23 +02:00

welcomescreen

WelcomeScreen: Clean up tag browser

2011-07-22 18:29:50 +02:00

runInTerminal.command

…

static.pro

debugger: rename gdbmacros* to dumper*

2011-06-29 10:21:55 +02:00