Some editors were removed, adapt indices

Change-Id: I87ab8c3aa8c6e9ccad494527ec93a171f90ecf83
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Was temporarily disabled for 2.7 and not supposed to be merged into 2.8
This reverts commit d3e69915.

Conflicts:
	src/plugins/android/androiddebugsupport.cpp

Change-Id: I669d587535545846b5fcbdadd0d066f1758a3644

Conflicts:
	src/plugins/android/androiddebugsupport.cpp
	src/plugins/qtsupport/qtsupport.qbs

Change-Id: I0953ca21a9db05084a79b8a6019189ea982df0b1

Change-Id: I134c6eefeff285ed8953c7b35c249ea757692c34
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Change-Id: I02f2bc70733e03b9b340c37019fef5d6a7af6872
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

libpng 1.6 prints a line warning about this whenever loading any
of these files.

Remove color mangement related sections as well as time information
from the PNG files using:

pngcrush -rem gAMA -rem cHRM -rem iCCP -rem sRGB -rem time -force -ow FileName

PNGcrush is losslessly recompressing the files, too.

Change-Id: I483dfb98414c4914840bd5ee9318153a599747b1
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

Change-Id: Ifbfc128b3785941d0c6ec1789f1c85d2c602738a
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Change-Id: I1b4dde1a63c8e2eb030cab3580abed845b270631
Reviewed-by: hjk <hjk121@nokiamail.com>

Change-Id: I8b7c423cd77e0f0aba89dcf1a397248a0edc0cf1
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

Change-Id: I813cf76d2df45daf0c981f3d136caebb96d03cf5
Reviewed-by: hjk <hjk121@nokiamail.com>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

Change-Id: I03caaf59bf6d41845b3f68194701579d7383e638
Reviewed-by: hjk <hjk121@nokiamail.com>

Change-Id: Iedfc0d59ecfe257ad5823cff39977bce82ada3a5
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

Change-Id: I9173f4040783460ba3b520b1a39a461de8283f21
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>

Helps avoiding trivial re-implementations.

Change-Id: Iaa2e6b92503a2b9553432568c2047c28899c7ea6
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

Making the default "pinned" will hopefully make people realize earlier
that the progress information has moved to the new location.

Change-Id: I5dbb3cae3680f724369b1a025cf38c5317a29fd0
Reviewed-by: hjk <hjk121@nokiamail.com>

Move logic to detect already open projects into ProjectExplorer itself,
along with some check for the canonicalFilePath.

Remove the same logic from the individual projectmanagers.

Put check that the path is a file into project managers. So far all of
them assume the project file to be a file (e.g. a xcode project manager
would expect a directory though).

Task-number: QTCREATORBUG-9350
Change-Id: I3901958395e3c594c8cfba9a85dc7d3ec3334afb
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

Change-Id: I18487bafeafe81a473e9b11945a20258c8b2b676
Reviewed-by: hjk <hjk121@nokiamail.com>

This prevents parts of gcc error messages from getting lost.

Task-number: QTCREATORBUG-9351
Change-Id: I5dd209194eac6606cd76aaea16e43f66f3ec52fa
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

This fixes a regression when starting debugging from the command line
using 'qtcreator -debug /some/binary,server="localhost:1234"'. The
parameters have been parsed correctly, but were later overwritten
by data from the default (desktop) "device".

Change-Id: I7747eaec6479e55cc18ea21ab1233e89ee9b119a
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

Task-number: QTCREATOR-9355

Change-Id: I36b77a95300fc1574c2e5bebb57722e6b3cb433a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Change-Id: I418394a106deac682b8c4ce6e8ecaac28324386d
Reviewed-by: Denis Mingulov <denis@mingulov.com>
Reviewed-by: hjk <hjk121@nokiamail.com>

Less noise, less cycles.

Change-Id: I5c924362bc3cce37f9fc63fe18479083b6a6acbf
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

Task-number: QTCREATORBUG-9272
Change-Id: I636be81544cf114405fbf70e4ee5724c4fd43685
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

* Replace RebaseManager with ConflictHandler
* Store StashGuard in GitClient, allow popping after
  a whole process is done (e.g. pull with resolved conflicts)

Change-Id: I85784f32f515ff896c73f35303c7de26f8006f59
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Change-Id: If5a05d12e7597516510d5726ca6d3418b3393251
Reviewed-by: Kai Koehne <kai.koehne@digia.com>

Quick fix. Do not merge into 2.8 or master

Task-number: QTCREATORBUG-9342

Change-Id: Ic63d5d858321e381caf9ede7615075e4923a7b35
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Reviewed-by: Kai Koehne <kai.koehne@digia.com>

Do not show warnings if recovering from an error.

Change-Id: I748a3f7ae63eb593ddeaa5de2ebf7264a456ac7d
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>

...even when NoPrompt is specified

Change-Id: I735133e390403a0f8f6aa573d6f9c63cf0784187
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Change-Id: Ice9f33e986688e8d2c5250435a30cd7cb1ac3b28
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

This fixes a bunch of warning when building with the updated qbs
version.

Change-Id: I644b4a4d0225b2e23ff1d9e1bf6d9d0136d6bbb5
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>

Change-Id: I7b842db01dcbd8faf3dc16dfb287dd5117342e1e
Reviewed-by: David Schulz <david.schulz@digia.com>

Whitespace, s/e/m_editorWidget/, remove unneeded struct, remove 'inline'
when not needed...

Change-Id: I1ce76f5c4b1febe45c4a3b6404107fed7d9c6868
Reviewed-by: David Schulz <david.schulz@digia.com>

This was implemented only for a small set of widgets. It's unlikely that
we will ever have or even want a dynamic language selection, until then
this code is only dead freight.

Change-Id: I1bff4e1e89057786c0e5cb57225a508c5d390d9c
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

Change-Id: I8fc97ed61c47af2c3d9e5cc2bf81e97661204d4f
Reviewed-by: David Schulz <david.schulz@digia.com>

Change-Id: Ibdd3147cc2a64407802fa237b7943d2e96c9003b
Reviewed-by: David Schulz <david.schulz@digia.com>

Change-Id: Ia2388e8c50185f80111fcf96aedb8143088e9a1c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
Reviewed-by: Petar Perisin <petar.perisin@gmail.com>

Change-Id: I72e5cd61ea67d87a3f82843ee1f3b42d13142dff
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>

Reduce compatibility issues e.g. on Mac. The previous versions
are not working well anyway.

Change-Id: If6cc7c1d4a85300d9bf054966216b52b35c0d1f2
Reviewed-by: hjk <hjk121@nokiamail.com>

Change-Id: I048ea80b48d693b7d44769e1f538d0c0050dbe2d
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

Cherry pick is git command that everyone who works with git knows. First
time I saw "Apply" I thought it was some git or gerrit command unknown
to me. Renaming it to "Cherry Pick" makes dialog more clear, since user
knows what command will execute when button is pressed.

Change-Id: Ifbcad697ef5f5909a36dc008f716025d48a26ad0
Reviewed-by: Orgad Shaneh <orgads@gmail.com>