Conflicts:
	src/libs/cplusplus/Overview.h
	src/libs/cplusplus/TypePrettyPrinter.cpp
	src/plugins/cpptools/cppcodecompletion.cpp

extra prompting

Conflicts:
	src/plugins/debugger/gdbengine.cpp

Now that we're showing this thing instantly, we can no longer rely on
the thing hiding cause of a focus change.

(cherry picked from commit 5a0a084c)

Conflicts:

	src/plugins/cpptools/cppcodecompletion.cpp

Done with: bjorn

Now it shows immediately when there is only a single signature of a
given method/constructor.

(cherry picked from commit 8b9dd766)

Conflicts:

	src/plugins/cpptools/cppcodecompletion.cpp

Deals with cases like "QString s(", but for the moment doesn't handle
yet "QString const s(".

Done with Roberto Raggi.

(cherry picked from commit fca3ec1f)

When completing, don't insert "();" characters when they're already
there. Skip them instead.

(cherry picked from commit 86427ecf)

Conflicts:

	src/plugins/cpptools/cppcodecompletion.cpp

just treat it the same as internal apps as far as gdbengine is
concerned.

Details:  This enables us to parse the build errors correctly.
          The makesteps of the qt4project and cmakeproject have some
          code dupliaction, which could be refactored. And the code
          to find out the correct build parser could probably also
          be done better, but we are now parsing the build output for
          cmake.

Crashed for example in the case of template instantiation. To make sure
the Function* stays valid, we need to not only keep around the Snapshot
but the whole LookupContext.

Done with Roberto Raggi.

(cherry picked from commit e8014347)

There is no particular reason to disallow changing the visiblity of the
dockwidgets in the debug mode in locked mode.

When the cursor isn't within the block that's being collapsed, it
shouldn't be moved. When it is, it will now move upwards instead of to
the start of the line.

Reviewed-by: mae

Now that we're showing this thing instantly, we can no longer rely on
the thing hiding cause of a focus change.