Reviewed-by: Christian Kamm

Task-number: QTCREATORBUG-1491

With the inclusion of org.webkit 1.0 types some common ancestors are shared
with different version numbers. These used to override each other. With this
patch the hierarchy is preserved.

This commit includes several changes by Marco Bubke.

Reviewed-by: Marco Bubke

Reviewed-by: kkoehne

Wire QDesignerIntegration's help signal to help manager.

Task-number: QTCREATORBUG-1505
Reviewed-by: kh <qtc-committer@nokia.com>

While reloading a text document, the bookmarks got lost since their
associated QTextBlocks were deleted.

This patch makes sure that before reloading, the bookmarks are removed
non-persistently in the same way as when closing a document, and that
they are restored after the document was reloaded.

Currently, no effort is made to update the location of the bookmarks
based on the way the file changed.

Task-number: QTCREATORBUG-1281
Reviewed-by: dt

Qt.labs.gestures and Qt.labs.filelistmodel weren't dumped before,
Qt.multimedia and Qt.widgets are gone.

Task-number: QTCREATORBUG-1507
Reviewed-by: Roberto Raggi

There is a hard limit on the number of file handles that can be open at one point per process on Mac OS X (e.g. it's 2560 on Mac OS X Snow Leopard Server, as shown by ulimit -a). Opening one or several .qmlproject's with a large number of directories to watch easily exceeds this. The results are crashes later on, e.g. when threads cannot be created any more.

This patch implements a heuristic that the file system watcher used for .qmlproject files never uses more than half the number of available file handles. It also increases the number from rlim_cur to rlim_max - the old code in main.cpp failed, see last section in

 http://developer.apple.com/maac/library/documentation/Darwin/Reference/ManPages/man2/setrlimit.2.html

for details.

Reviewed-by: ckamm
Task-number: QTCREATORBUG-1487
Task-number: QTCREATORBUG-1486

Task-number: QTCREATORBUG-1501
Reviewed-by: Roberto Raggi

Reviewed-By: Oswald Buddenhagen

Task-Nr: QTCREATORBUG-1411

When there was no existing configuration, it would get set to pure black
on startup, resulting in a very dark gray Qt Creator. Now it is back to
its old friendly gray as default color.

Also made sure that the default on startup and the color used for
resetting the UI color in the settings are always in sync.

Reviewed-by: Jens Bache-Wiig

Fix for QTCREATORBUG-1490

Reviewed-By: Friedemann Kleint

It was broken due to a leading space which was trimmed off, breaking the
begin and end positions. Instead, don't trim, but just make sure not to
add a leading space when it is not necessary.

Done-with: Christian Kamm <christian.d.kamm@nokia.com>
Task-number: QTCREATORBUG-1398

Reviewed-by: Oswald Buddenhagen

Quite a few people seem to prefer this and it is the default in Eclipse
and MSVC.

This applies to both C++ and QML completion.

Task-number: QTCREATORBUG-1474

Due to different text positioning logic between the QItemDelegate and
the way SearchResultTreeItemDelegate drew the line numbers, the line
numbers did not align properly to the line of text next to it.

This was fixed by relying on QItemDelegate::drawDisplay for drawing the
line numbers, so that the same positioning logic is used.

This exposed a small right-alignment bug in QTextLayout, for which a fix
is coming to Qt.

Done-with: Erik Verbruggen

Reviewed-by: Kai Koehne

Reviewed-by: Kai Koehne

Reviewed-by: Kai Koehne

all of creator requires qt 4.7 now

Only insert necessary newlines

Reviewed-by: thorbjorn
Task-number: QTCREATORBUG-1476

(partially cherry picked from commit dd714e9c)

Doh!
(cherry picked from commit df0e1e56)

Task-number: BAUHAUS-651

for verbose python error hunting.
Rubber-stamped-by: hjk

The value was adjusted to the referenced value but it was not used
when dumping the members, basically leading to an empty child list
in such cases.

I now cache the scaled welcomemode background so it feels more
responsive when toggeling back and forth between modes.

Reviewed-by: joao

Task-number: BAUHAUS-729, BAUHAUS-731