Conflicts:
	src/plugins/qmldesigner/components/formeditor/abstractcustomtool.cpp

Change-Id: I4e0a85795e7f4bfcdc21d106517517b527f85104

Fixes a regression introduced by cb857b47

Task-number: QTCREATORBUG-9226
Change-Id: I619df0eb8b5f016aac54a0260eb941fd91a348aa
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: hjk <hjk121@nokiamail.com>

The patching of imports and plugins is done automatically by macdeployqt,
we need to pass it the qml2puppet executable though.
Also add Qml2Imports to the qml(2)puppet's qt.conf.

Task-number: QTCREATORBUG-9136
Change-Id: I9cb21d104f4c0c42531facfc6bc92fa9663e95a9
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>

The user is now asked where to store the generated SSH key,
before it is generated, and if that would fail, is still
enabled to select a different key.

Task-number: QTCREATORBUG-9101
Task-number: QTCREATORBUG-9102
Change-Id: I8e2f732dbcbe7bd3bd3fa9b512a7a195fa868c17
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: Rafael Roquetto <rafael.roquetto@kdab.com>
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>

Redo the Attach dialog to use Kits. This is in sync with
the Valgrind Attach dialog.

Change-Id: Iaf0c8bc2c5a912b6a93ed21b9757a074a60041c0
Reviewed-by: Christiaan Janssen <christiaan.janssen@digia.com>

Fixes the following pattern:

    Subject

    # comment

    Another line - considered as subject

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

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

Italic is harder to read, especially when there are many of them

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

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

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

Replace explicit 'git log' call

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

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

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

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

* Added a Graph toggle button for log editor
* Hide diff parameters when Diff is off
* Remove GitClient::graphLog

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

Refactor combobox values to use %1 as a placeholder for values

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

Preprocessor did not correctly handle when variadic macro arguments were not
provided at all, if there were other arguments: macro was not expanded
in case only the non variadic arguments were given.

 #define MACRO(...)       used to work fine for 0 or more arguments.
 #define MACRO(ARG0, ...) used to work only for 2 or more arguments, now fixed.

Change-Id: I64e9199ceccae05618a49931c2adad8e4f9471ba
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>

Change-Id: Ib0d776143b787b0862d6797aaca4a1edc9865da2
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>

This moves the parsing of the output from all blackberry-* processes
used in the deploy steps, and when launching the application on the
device, to a separate class. Errors and warnings coming from those
processes will have issues added to the Issues tab.

Change-Id: I455b26d77301bdfe93ece2c8470526ed174a50ed
Reviewed-by: Mehdi Fekari <mfekari@blackberry.com>
Reviewed-by: Nicolas Arnaud-Cormos <nicolas@kdab.com>

Adds a local variable which stores the return value of a function call
or new expression.

Task-number: QTCREATORBUG-9052
Change-Id: I1fccbdd5b9f28c8409a4b0fa24610e406de61b24
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>

CppTools.lib(CppTools.dll) : error LNK2005: "public: virtual __thiscall
  QFutureInterface<class TextEditor::HighlightingResult>::~QFutureInterface<class TextEditor::HighlightingResult>(void)"
  (??1?$QFutureInterface@VHighlightingResult@TextEditor@@@@UAE@XZ) already defined in moc_cppeditor.obj
   Creating library ..\..\..\lib\qtcreator\plugins\QtProject\CppEditor.lib and object
   ..\..\..\lib\qtcreator\plugins\QtProject\CppEditor.exp..\..\..\lib\qtcreator\plugins\QtProject\CppEditor.dll :
   fatal error LNK1169: one or more multiply defined symbols found

Change-Id: Id53a0f8a99dbd18a9cbdf2af57b4f3970f5c41a3
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>

This reverts commit 316f15cb3b6ce8aedaaee5a954da9d99b1090350

Wrong branch, should be master.

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

Action like "Switch Header/Source" need to be performed in correct
context, in this case "CppEditor.C++Editor". But while command line is
focused the context is global.

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

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

If the LogChangeDialog is closed without selecting any
commit, interactive rebase started with '^' as the commit.

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

The model manager provides the import paths defined in .pro
and .qmlproject files.

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

This was missing for a couple of items and creating confusion,
if another item of the same name was used.

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

This makes command stand out. Before it looked like regular branch.

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

this is where stash popup question belongs

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

Change-Id: I399d667a1fccb376fadbd6ab8fbba243e86d8f4b
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>

Contains SourceGenerator class which was also used to generate app
template in PythonProjectManager; it saved for future use.

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

Change-Id: I59fdb898e270af0fcc18e79ae922e119504ef10e
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>

- Moved document update handling into CppTools.
- Moved semantic info calculation into CppTools.
- Moved semantic highlighting into CppTools.

Change-Id: I253861bf074a64b1f657f7a4a8e6583871b5285f
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@digia.com>

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

Change-Id: I5c48b74a99b12d7e319198ec8f352ff493259df8
Reviewed-by: Kai Koehne <kai.koehne@digia.com>
Reviewed-by: Eike Ziller <eike.ziller@digia.com>
Reviewed-by: Aurindam Jana <aurindam.jana@digia.com>

This makes them align to the other "editor split" shortcuts.

Change-Id: I0b300ae495ffa17062a0a52b148f61015b965c29
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>

After processing configurationFileName() the first time, it was added to
the already seen files (m_included). Thus, on parsing further files, it
was ignored and with that all the project defines.

Task-number: QTCREATORBUG-9107
Change-Id: Ia4817dfa3b30ed27d142f7f3eeb6f099d0653441
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>

If object names are scattered across multiple lines the
script failed to get the whole object name and failed therefore.
This patch corrects this behavior.

Change-Id: Ia97e2577162b77ae1b72fdd51dda4c74c59abe25
Reviewed-by: Robert Loehning <robert.loehning@digia.com>

The GenericHelper structure is not needed.

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

So ChangeSelectionDialog does not show full path of current file, but
just path to top level dir

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