Eike Ziller e2b0835b58 Merge remote-tracking branch 'origin/2.4' ...

Conflicts:
	qtcreator.pri
	src/libs/qmljs/qmljstypedescriptionreader.cpp
	src/plugins/analyzerbase/startremotedialog.ui
	src/plugins/qmldesigner/designercore/include/rewriterview.h
	src/plugins/qt4projectmanager/makestep.cpp

Change-Id: If9d15a8c8f73106585fd8ce6ac47c253a40af6b1

2011-11-25 09:48:25 +01:00

..

designer

Fixes: Implement make install target, Step 1

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

dumper

C++-Dumpers: Compile with Qt 5.

2011-11-24 13:41:23 +01:00

generic-highlighter

Add valgrind suppression syntax highlighting file.

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

glsl

all: s/info@qt.nokia.com/qt-info@nokia.com/

2011-11-03 10:33:19 +01:00

patches

Changed links to bugtracker to https

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

qml

qmldump: Fix dumping empty names for generated QMetaObjects.

2011-11-17 13:54:11 +01:00

qml-type-descriptions

QmlJS: Update builtin Qt 5 qmltypes.

2011-11-22 12:19:10 +01:00

qmldesigner/propertyeditor

String fixes

2011-11-03 10:36:46 +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

Merge remote-tracking branch 'origin/2.4'

2011-10-28 10:17:44 +02:00

templates

The pri files already put the plugin spec into OTHER_FILES

2011-11-24 07:56:10 +01:00

translations

Validate french translations for 2.4.

2011-11-23 17:45:36 +01:00

welcomescreen

new design of the welcomepage

2011-11-23 13:57:13 +01:00

static.pro

Provide qmlviewer in external tools menu

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