Task-number: QTCREATORBUG-1571
Reviewed-by: Leena Miettinen

Reviewed-by: Roberto Raggi

Reviewed-by: kh1

No strings translations were harmed in this commit. No kittens either.

Reviewed-by: Alessandro Portale

On Mac, QKeyEvent::text() returns non-empty strings for cursor keys. This
breaks some of the logic relying on text() being empty for "special" keys.

This is a quick fix to make it usable.

- Enable qmlprojectplugin even if Qml support is disabled.
- But disable its wizards in that case.
- Disable the Qml file wizard if the support is off.

Reviewed-by: Kai Koehne

Reviewed-by: kh1

While 2641496a removed the marks check entirely, a fix for the same
issue made on the master branch (1263babf) changed it to check
whether the line numbers are visible. This is more correct.

Reviewed-by: mae

Reviewed-By: thorbjorn

Task-Nr: QTCREATORBUG-965

In theory this should have been a backport of the search-related commits
7e8c345a and 46fa3aa7, but they are buried in the middle of the Big
Commandline Reorganization. Just taking everything has lower risk and
is faster.

We missed some environment vars that had to be set to make the script
work. NOTE: still does not work on windows, since madbin\pkg-config.cmd
needs to be too.

Reviewed-by: kh

(cherry picked from commit 00171038)
(cherry picked from commit 9f8da8aa)

Not needed anymore after the general QML support got deactivated.

This reverts commit 74bd95d3.

To get QML functionality back, export QTCREATOR_WITH_QML before
running qmake

Reviewed-by: Kai Koehne

Was broken in 915a07bd, which caused
help links only to be resolved for expressions under the cursor.

Task-number: QTCREATORBUG-159
Reviewed-by: ckamm

The ProjectFilesEditor used for editing the generic project's files does
not show text marks, which broke the line select in the gutter.

Task-number: QTCREATORBUG-1238
Reviewed-by: mae

The various text editor overlays and the text cursor were being painted
on top of the collapsed block popup.

Reviewed-by: mae

This fixes QTCREATORBUG-1434, but it's more of a workaround than a fix.
The problem was that the file was opened in the diff editor due to a
broken diff detection, and the diff editor in turn has a bug in that
it's kind of halfway read-only.

Reviewed-by: ossi
Task-number: QTCREATORBUG-1434

Reviewed-by: Kai Koehne

Influences the position of the folded-block markers.

Reviewed-by: thorbjorn

Reviewed-by: Leena Miettinen

Reviewed-by: Leena Miettinen

Reviewed-by: Leena Miettinen

Reviewed-by: Christian Kamm

Reviewed-by: Christian Kamm

The isContainer flag is now ignored.

Reviewed-by: kkoehne

This is not only a waste of ressources, but breaks a check later on
which tries to load the QML examples from Creators ressource path
if no QML capable Qt version is found (included with Creator packages)

Reviewed-by: dt

Task-number: QTCREATORBUG-1425
Reviewed-by: Christian Kamm

state

The position is now setted int the base state if you drop a item on the
formeditor and move it around.

Task-Number: BAUHAUS-644
Reviewed-by: kkoehne

Reviewed-by: Thomas Hartmann

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

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