Eike Ziller 4acece6d9e Merge remote-tracking branch 'origin/2.7' into 2.8 ...

Conflicts:
	src/plugins/qmljstools/qmlconsoleitemdelegate.cpp
	src/plugins/qmlprofiler/qmlprofilerengine.cpp

Change-Id: I95c2c4116e28683fafcc0a557a7913d67361dcd4

2013-06-05 11:14:48 +02:00

..

designer

…

dumper

Debugger: Work on LLDB dumper autotests

2013-06-04 17:04:29 +02:00

generic-highlighter

Git: Provide a real highlighter for interactive rebase

2013-06-03 10:40:32 +02:00

glsl

Incremented year in copyright info

2013-01-29 16:27:03 +01:00

qml

QmlDesigner: Remove code which does nothing

2013-06-04 14:37:35 +02:00

qml-type-descriptions

Add missing QtQuick.Controls/Dialogs/Layouts type descriptions

2013-05-27 17:57:36 +02:00

qmldesigner/propertyeditor

QmlDesigner.PropertyEditor: Adding sheet for QtQuick.Window

2013-05-23 15:35:53 +02:00

qmlicons

PNG: Fix warning about sRGB information

2013-05-27 16:12:01 +02:00

schemes

Change the shortcut for ui form preview

2010-08-25 11:57:02 +02:00

scripts

consoleprocess: support Terminal.app on mac

2013-01-29 17:56:59 +01:00

snippets

add $type$ variable to Q_PROPERTY cpp snippet

2013-03-27 09:11:02 +01:00

styles

CppHighlighter: highlight all functions/methods.

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

templates

Merge remote-tracking branch 'origin/2.7' into 2.8

2013-05-24 16:20:10 +02:00

translations

Merge remote-tracking branch 'origin/2.7' into 2.8

2013-06-05 11:14:48 +02:00

welcomescreen

Merge remote-tracking branch 'origin/2.7'

2013-05-03 09:49:28 +02:00

static.pro

make phony_target hack work on mac even with qt 5.1

2013-05-14 19:16:22 +02:00