Eike Ziller db4311d5b5 Merge remote-tracking branch 'origin/2.6' ...

Conflicts:
	dist/gdb/Makefile.osx
	src/libs/qmldebug/qmldebug.qbs
	src/plugins/android/androidsettingswidget.cpp

Change-Id: I85627130b575f7d08f416dea52031fa72019b217

2012-10-04 12:23:39 +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.6'

2012-09-26 10:01:04 +02:00

generic-highlighter

Add AutotoolsProjectManager plugin

2011-11-30 14:16:12 +01:00

glsl

Contact -> qt-project.org

2012-07-19 13:23:21 +02:00

qml

QmlDesigner: fix warning

2012-10-02 17:13:22 +02:00

qml-type-descriptions

QmlJS: Update builtins from Qt 5.

2011-12-08 14:23:01 +01:00

qmldesigner/propertyeditor

QmlDesigner: use import QtQuick 1.0 and not Qt 4.7

2012-09-27 11:19:39 +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

Snippets: Add 'switch' trigger for C++ code snippets

2011-10-06 16:46:18 +02:00

styles

CppHighlighter: highlight all functions/methods.

2012-06-05 09:30:54 +02:00

templates

QNX: Fixed compilation for BlackBerry QtQuick2 template

2012-09-05 07:34:52 +02:00

translations

German translation for 2.6.

2012-10-02 12:38:17 +02:00

welcomescreen

doc: Fix some spelling errors

2012-09-21 16:26:19 +02:00

static.pro

Introduce $$QTC_PREFIX

2012-09-25 10:14:51 +02:00