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

Conflicts:
	qtcreator.pri
	qtcreator.pro
	src/plugins/qtsupport/debugginghelperbuildtask.h

Change-Id: I6e013efa40ee4d5addcc76d6ff13e7f4fa98cc1d

2012-01-24 11:04:39 +01:00

..

designer

Fixes: Implement make install target, Step 1

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

dumper

debugger: don't use derived dumpers if already dumping in base

2012-01-24 09:57:23 +01:00

generic-highlighter

Add AutotoolsProjectManager plugin

2011-11-30 14:16:12 +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 builtins from Qt 5.

2011-12-08 14:23:01 +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

Wizards: allows filtering of wizards based on Qt version

2012-01-18 15:13:52 +01:00

translations

Merge remote-tracking branch 'origin/2.4'

2012-01-24 11:04:39 +01:00

welcomescreen

WelcomePage: layout fixes for the develop page

2012-01-23 13:30:44 +01:00

static.pro

Provide qmlviewer in external tools menu

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