Conflicts:
	src/plugins/debugger/debuggeruiswitcher.cpp
	src/plugins/git/gitclient.cpp
	src/plugins/qmlprojectmanager/qmlprojectapplicationwizard.cpp

Reviewed-by: Lasse Holmstedt <lasse.holmstedt@nokia.com>
Task-number: QTCREATORBUG-2002

missing else

We are checking the whole prototype chain now

Using the proper editor area (was cut off on the top). Not using
expensive alpha transparency anymore, but rather a slightly darker
color. Removing years-old rotten code that was in an '#if 0'.

Returns the area of the editor as QRect in global coordinates.

Works on Windows now. Done with and reviewed by dt, so blame him
if it is now broken on Unix.

Done-with: dt

Reviewed-by: Carsten Owerfeldt <carsten.owerfeldt@nokia.com>
Initial-patch-by: Roberto Raggi <roberto.raggi@nokia.com>

When a change is done to an element that cannot be changed due to
debugger/qdeclarative limitations, a warning is shown to the user in QML
JS Editor.

Reviewed-by: Olivier Goffart

Reviewed-by: Thomas Hartmann

Reviewed-by: Tobias Hunger

Reviewed-by: Roberto Raggi

Block selection was "broken" when using tabs, or rather
incomplete: It treated tabs as normal characters, which
has shown to be unexpected by people using tabs in code.

The new implementation has a vastly improved find scope
as well. In addition, creating a blog selection with
mouse or keyboard feels a lot more solid now, as the
actual selection is detached from possible valid cursor
positions.

Task-number: QTCREATORBUG-1541

Reviewed-by: kh1

Apparently creator uses the kate highlighter file to find the
mumetype of a file.
But kate annotate qml file with text/x-qml instead of application/x-qml
that we expect