This fixes a incompatibility with the config settings.

Change-Id: I518291af2309acfaba7eea78b22519c283114009
Reviewed-on: http://codereview.qt-project.org/6161


Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>

Change-Id: Id3d81e59f85d9b7d2dbadef337b97be13a37a598
Reviewed-on: http://codereview.qt-project.org/6160


Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>

Change-Id: Id4c3bd97f806e502fe64ca9bd4864938d918dc73
Reviewed-on: http://codereview.qt-project.org/6156


Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Robert Löhning <robert.loehning@nokia.com>

(cherry picked from commit 2e968aa9)

Change-Id: Ib0ce148edc46a663622d9437da3b7b977baad716
Reviewed-on: http://codereview.qt-project.org/6153


Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christian Stenger <christian.stenger@nokia.com>

After discussing the subject we have opted to not automatically track
and synchronize shared settings. The current use case is that one
needs to manually created/edit a .shared file and place it under the
project's directory. We then identify such settings and merge then
into the user ones. Whenever the user changes such a setting in a way
it differs from the .shared value we mark it as a sticky setting.

Change-Id: I1a7196acea5fb76c3ba21ce950a7bfd1aa774da3
Reviewed-on: http://codereview.qt-project.org/5985


Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
(cherry picked from commit 97e93991)

Task-number: QTCREATORBUG-6204
Change-Id: I6a8206b1675d99b29aa2b96565a4bd1e1dabbf26
Reviewed-on: http://codereview.qt-project.org/6142


Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

Change-Id: I89c7743331bb28bbabe946df3da8fede44652414
Reviewed-on: http://codereview.qt-project.org/6138


Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>

Add more info about other project wizards

Change-Id: I5b143fb1d8203b0a068e07952952f812b2a601df
Reviewed-on: http://codereview.qt-project.org/6136


Reviewed-by: Daniel Teske <daniel.teske@nokia.com>

Change-Id: I0843e1ebb07b3974e13d63f75303c31fab892683
Reviewed-on: http://codereview.qt-project.org/6135


Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>

Target selection is not necessary if only one target is installed.

Task-number: QTCREATORBUG-6237
Change-Id: I26da73aa6d0040f3d86fd485c354b40f86471245
Reviewed-on: http://codereview.qt-project.org/6037


Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>
(cherry picked from commit 21f3a69d)
Reviewed-on: http://codereview.qt-project.org/6125


Reviewed-by: Leena Miettinen <riitta-leena.miettinen@nokia.com>

Change-Id: I16f0d8880003156722cd80fdc51b0f8f21a5bfae
Reviewed-on: http://codereview.qt-project.org/6120


Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

This first line of an error needs to make sense on its own.

Change-Id: Ibf3bce7107e8b3df8fa4d0e75924945027678c63
Reviewed-on: http://codereview.qt-project.org/6114


Reviewed-by: Christian Kamm <christian.d.kamm@nokia.com>

Also adapt the Qt Creator plugin template to make it
possible to choose between deploying locally or into
Qt Creator's build directory.

Change-Id: Ia8566a5034443bc9574a1593eddf0a89eb4d80b2
Rubber-stamped-by: Daniel Molkentin
Reviewed-on: http://codereview.qt-project.org/4178


Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

VCSBaseClient handles saving of settings for us, but we do not
use that yet, so we have to do that ourselves:-(

Change-Id: I731d01d429497581fad814effd68bbd784e05fe8
Reviewed-on: http://codereview.qt-project.org/6080


Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>

Use VCSBase::Command instead.

Change-Id: I819e61c2fdf705717709f49ea42ad822d25300fb
Reviewed-on: http://codereview.qt-project.org/6079


Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>

VCSBase::Command was created from GitCommand, it replaces VCSJobRunner.
VCSBase::Command is simpler to use (in VCSBaseClient) and commands
can show up in the progress manager.
From now on, the git plugin can easily rely on vcsbase.

Change-Id: I40593f354249cd94a4c79e90f9bf1362ff3bf5ec
Merge-request: 394
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>
Reviewed-on: http://codereview.qt-project.org/6078

Allows using qml files referencing qrc resources in the designer.

Change-Id: I8a3ae9c5a0fb38c47505cc606609acb41f648bbc
Reviewed-on: http://codereview.qt-project.org/6075


Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

Create an Item as stand-in.

Change-Id: Ic6521bcade216bbb04679eabd909d2eec3d8a366
Reviewed-on: http://codereview.qt-project.org/6076


Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>

Otherwise we might get an unnecessary scrollbar.

Change-Id: I12ab2288a02f32f542420b0e979c24aeaa00522d
Reviewed-on: http://codereview.qt-project.org/6063


Reviewed-by: Daniel Teske <daniel.teske@nokia.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@nokia.com>

Change-Id: Ic45a2bbc4773e903d8fa955b519171bed935f38e
Reviewed-on: http://codereview.qt-project.org/6062


Reviewed-by: Daniel Teske <daniel.teske@nokia.com>

The QmlJsDebugger likes to remove breakpoints in the
BreakpointInsertProceeding state. The state transition from
BreakpointInsertProceeding to BreakpointRemoveRequested is now
allowed. The state of breakpoint is set to BreakpointInserted
only when the breakpoint is hit.

Change-Id: I2fdd8d916363866fd920af7488f78d92df54d93b
Reviewed-on: http://codereview.qt-project.org/5899


Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>

Use a invalid ABI since we have no idea what we will end up running.
Make the debugger figure out specifics when needed.

Change-Id: Ia74080887617a097a16d789dfd7f88458409a23c
Reviewed-on: http://codereview.qt-project.org/6065


Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

Change-Id: Ifaa6468ca17cba1de808a9cbeba325925985ee10
Reviewed-on: http://codereview.qt-project.org/6077


Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>

Change-Id: Ic3b062c8be71887e00b6cfef2a52c61260c2e0ef
Reviewed-on: http://codereview.qt-project.org/6073


Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>

Change-Id: I873d2caa2cead5c339eec887a5fcdef4d33bec24
Reviewed-on: http://codereview.qt-project.org/6071


Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>

Change-Id: I554e46cc5e3c1b55bc245f20f7f9541103afb8c5
Reviewed-on: http://codereview.qt-project.org/6070


Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>

Change-Id: Icf23c7c3c1c8858d281434f519accc96984cdd09
Reviewed-on: http://codereview.qt-project.org/6069


Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>

Change-Id: Ibf2e2871a8e7cd61ade67caf0d110359ffba71d5
Reviewed-on: http://codereview.qt-project.org/5999


Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

Change-Id: I10024c9762c748d119afe559ea2838adf5e13739
Reviewed-on: http://codereview.qt-project.org/6067


Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>

Change-Id: Ic41e71e0f21fbf000202e8fc05262f5615b46c1d
Reviewed-on: http://codereview.qt-project.org/6066


Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Tobias Hunger <tobias.hunger@nokia.com>

Change-Id: I11c114787cc3c2721147d55c86f87aaf31daec9e
Reviewed-on: http://codereview.qt-project.org/5644


Reviewed-by: Christian Stenger <christian.stenger@nokia.com>
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>

The issues pane now also contains e.g. results of an analyzer run and
QML warnings, so it's not only about 'Build Issues' any more.

Change-Id: Ifb9c79bd5b074e6811cc015560af3d72bf9dfcf2
Reviewed-on: http://codereview.qt-project.org/5977


Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Eike Ziller <eike.ziller@nokia.com>

Make the taskwindow semi-graciously handle my Qt Creator build
with 91k build issues.

Change-Id: I47275e2057d2ff9bf5229f0a367bb19c4f3141e4
Task-number: QTCREATORBUG-1551
Reviewed-on: http://codereview.qt-project.org/5263


Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Daniel Teske <daniel.teske@nokia.com>

Change-Id: I684a764797cd75a231f3da611ca6afeabdd48f61
Reviewed-on: http://codereview.qt-project.org/5835
Reviewed-by: Lasse Holmstedt

Previous commit allows to hit cpp breakpoints before the QML engine
is up and running, so there is no need anymore to set breakpoints early
on.

Change-Id: Ia0de490d54057d51c4585c56fa9083de982ba97b
Reviewed-on: http://codereview.qt-project.org/5896


Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Christiaan Janssen <christiaan.janssen@nokia.com>

Change-Id: Id9743739fafe42c3d0f695cec0342b68544c64b0
Reviewed-on: http://codereview.qt-project.org/5992


Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

The base environment depends on *all* library pro files.
Do emit baseEnvironmentChanged accordingly.

Change-Id: Ia24f3d65492fbe7d2bb4f9fa9e46202ae1764213
Reviewed-on: http://codereview.qt-project.org/5991


Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

Change-Id: Ide9ee35677a49c52788042df9fedffb4cf90f857
Reviewed-on: http://codereview.qt-project.org/5898


Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Aurindam Jana <aurindam.jana@nokia.com>

The main engine now follows mostly the state of the gdb engine,
only if a breakpoint is hit/while stepping the state of the qml
engine is used. This allows us to hit C++ breakpoints at any time
(also when the qml engine hasn't been able to connect yet), and
also fixes the invalid transition warnings.

Change-Id: If67a56fd28b098952be2606d0a46e04c27835f66
Reviewed-on: http://codereview.qt-project.org/5897


Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>

Change-Id: Id314517cbb0b0e943e08261eee922b2724dcaa49
Reviewed-on: http://codereview.qt-project.org/5982


Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>