Task-number: QTCREATORBUG-1567
Reviewed-by: Friedemann Kleint

Reviewed-By: Leena Miettinen
Reviewed-By: kh1

Reviewed-By: Leena Miettinen

Reviewed-By: kh1

Reviewed-by: jbache

the async re-parsing code breaks the assumption that project
parsing only ever starts with a single non-concurrent evaluation
(of the top-level project file), so the population of the base
values in the shared ProFileOption was happily causing crashes.

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

Reviewed-by: Leena Miettinen

Reviewed-by: dt

Reviewed-by: Tim Jenssen

Reviewed-by: olli
Reviewed-by: Niels Weber

This was adding the generated style sheet

This reverts commit ad3d3dac.

Reviewed-by: Leena Miettinen

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

Reviewed-by: Leena Miettinen

Reviewed-by: Roberto Raggi

Reviewed-by: kh1

We disabled the visible parts of the Qml support by default for the 2.0
release. Defining QTCREATOR_WITH_QML brings it back.

This hack should be removed as soon as 2.0 is shipped.

Reviewed-by: Daniel Molkentin

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.

Since fa640f66 we're always switching to the base state when going
from state A to state B. Fix autotests accordingly.

Commit 112df597 removed the definition, but not declaration of
test method.

Reviewed-by: erikv

Reviewed-by: Oswald Buddenhagen

Reviewed-by : Daniel Molkentin
(cherry picked from commit 514b30ec,
this was accidentially committed into 2.0.0 first)

- 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)