Git: Remove diff editor

Not used anymore

Change-Id: Ie1c79583938e24c3bad8acad7acc2f0574234450
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
QbsProjectManager: Added functionality to remove files from projects

Change-Id: I3371e14b5fbf2eaaacc833b289f945aed57cc80e
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Help: Open example documentation in extra window

Also remove the hack that HelpManager::handleHelpRequest looks
for ?view=split in the URL and use an enum instead.

Change-Id: I4ad74775381cf0b321181358266d8e89c6e277b5
Reviewed-by: Karsten Heimrich <karsten.heimrich@digia.com>
Git: Fix sha1 resolving when a branch is added from detached HEAD

Change-Id: I0d8ad988411256fc284b84f78be6f54362ab19ea
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Git: Use a separate thread for updating commit data

Task-number: QTCREATORBUG-12449
Change-Id: I3057ca458272daac72c54abce1d6f9acf6a5d4af
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
QmlDesigner.PropertyEditor: Fix GeometrySection

This fixes a regression introduced by
commit 1da0d018c2dde2de048e80d1335875d6ce96c49c.

Task-number: QTCREATORBUG-12501
Change-Id: I96dd1c19afa6b6b0a56ef5f6ea5e01272aa1b774
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
ios: correctly replace cryptic Locked message when deploying

Change-Id: I19e33d5c7e35f9d76c81469d3772bc800ce1760b
Reviewed-by: Richard Moe Gustavsen <richard.gustavsen@digia.com>
QmlProfiler: Put height of rows in the timeline into the model

Like that we can provide functionality to interactively resize rows in
the model so that one can zoom in to more interesting parts.

Change-Id: I31f14cd8aa37703240ebec744ca2e77188fb0f27
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
QmlProfiler: allow interactive resizing of rows in timeline

Task-number: QTCREATORBUG-12337
Change-Id: Ib9ddb128605831841023bb3cc9aed758ed171de9
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
QmlProfiler: Add scales to rows in timeline

If you resize the rows to at least double their default size and if the
model specifies a scale it will be drawn as additional horizontal lines
and numbers in the background.

Change-Id: I02844b4102e043031ee04daa45666dc3f8da1d2e
Task-number: QTCREATORBUG-12337
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Merge remote-tracking branch 'origin/3.1'

Conflicts:
	src/plugins/winrt/winrtruncontrol.cpp
	src/plugins/winrt/winrtruncontrol.h

Change-Id: Idad0558e53e23debee8523586b681af4705e97f6
Merge branch 'master' of ssh://codereview.qt-project.org/qt-creator/qt-creator
QmlProfiler: restore tooltips on category labels

They had been lost somewhere between QtCreator 2.8 and 3.0. Also
putting the location in braces looks nicer than the original.

Change-Id: Ia455ba99015ad38c21e528a0f8177902749ba1d5
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
QmlProfiler: access the background marks from where they're created

It's considered bad style to access properties of parent objects
defined in a different component as that reduces code reusability.

Change-Id: I0dbe4a3663026d12b2666de75c93841528fe295c
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
QmlProfiler: Add scaling support to paint events model

Change-Id: I04856628b7498df976d3b7db5539a1125060e9eb
Task-number: QTCREATORBUG-12337
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
QmlProfiler: Draw selection boxes only as large as the items

Change-Id: I0f7f4f2a73c24faeff9c502b118e984938a27d25
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
QmlProfiler: replace calls to QVector::length() with QVector::size()

Like that we get a higher chance of staying compatible with Qt < 5.2.

Change-Id: Iecd6e1fbf75bd610917a38a22635a0d8e731738f
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Variables: Show current value of variable in chooser dialog

Helps to determine whether a specific variable is the right one
to use. At least structure can be more easily inferred than from
most available descriptions.

Change-Id: I401603934a99e3d3fe9a26c7cb617b9baa0d502c
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Variables: Use lambdas as callbacks to resolve variables

Instead of broadcasting for each resolution we ask the code
that knows about a specific variable directly.

Change-Id: I2f0f4f2acceba85a236995d236980594a3166bd8
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Add syntax highlight for primitive data types

Syntax highlight rules for keywords are changed to highlight control
keywords and primitive data types separately.

Change-Id: Ifb25be7a97b92589030aa190641320c233dc7f2d
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>