Eike Ziller e5ca4b3462 Merge remote-tracking branch 'origin/2.3' ...

Conflicts:
	qtcreator.pri
	share/qtcreator/dumper/dumper.py
	share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.h
	src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
	src/plugins/valgrind/valgrind.pro
	tests/manual/gdbdebugger/simple/simple_gdbtest_app.cpp

Change-Id: Ic2d347012d89d697e6382f156e64f9619da88300

2011-07-15 14:29:07 +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.3'

2011-07-15 14:29:07 +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 remote-tracking branch 'origin/2.3'

2011-07-15 14:29:07 +02:00

qml-type-descriptions

Merge remote-tracking branch 'origin/2.3'

2011-07-15 14:29:07 +02:00

qmldesigner/propertyeditor

QmlDesigner.propertyEditor: fixes editor for ListView

2011-07-14 17:17:33 +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

Wizards: Use showFullScreen for Simulator builds.

2011-07-12 12:09:10 +02:00

translations

Improved German translation

2011-07-13 18:26:08 +02:00

welcomescreen

Show tool tip with news url.

2011-07-14 11:16:51 +02:00

runInTerminal.command

make terminal emulator configurable centrally

2009-04-14 11:41:23 +02:00

static.pro

debugger: rename gdbmacros* to dumper*

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