GitLab

Disentangle binding to an existing command from the actual task of
the conflict handler. This makes usage more clear.

Also rename "command" to "abortCommand" which is also more clear
as to what it is used for.

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

.. of builtIn qml and cpp code over "Inspect API For Element Under
Cursor" action.

Change-Id: I70d5bec2933b682295c5242248a2b0f95dba4e76
Reviewed-by: Kai Koehne <kai.koehne@theqtcompany.com>

Change-Id: Idfc99f79c04473ee5d432cb64b6bfbdde2847802
Reviewed-by: André Hartmann <aha_1980@gmx.de>

Broken by dcdcf540

.

Change-Id: I8e3015f710a8e7dd059b8419e66f58c76373b297
Reviewed-by: André Hartmann <aha_1980@gmx.de>

Change-Id: Ib20c1f425f91f34749bce837f14ef7a1e36273e3
Task-number: QTCREATORBUG-13615
Reviewed-by: BogDan Vatra <bogdan@kde.org>

They work too, we just need to parse which api level they have.

Change-Id: I8f9da57f738d142a849ca41cb678bed6abaefd17
Task-number: QTCREATORBUG-13980
Reviewed-by: BogDan Vatra <bogdan@kde.org>

And make that the default. SdCards are not that useful, so
creating one by default is odd.

Change-Id: Iddb34e9e3387c9c4488f7b2bc11799cfc28c9a43
Task-number: QTCREATORBUG-13590
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: BogDan Vatra <bogdan@kde.org>

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

Use it in favor of git's synchronousGit method.

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

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

Use that in the gitplugin in favor of fullySynchronousGit.

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

Change-Id: I15dd0b88b2e908dde398df06bc03394a700839a7
Reviewed-by: Lukas Holecek <hluk@email.cz>
Reviewed-by: hjk <hjk@theqtcompany.com>

In normal mode:
input: |aaa bbb
keys: yiw A C-r 0
result: aaa bbbaaa

Change-Id: Ifb2ac8603adf9c897d169f4ab282a3ee97896684
Reviewed-by: Lukas Holecek <hluk@email.cz>
Reviewed-by: hjk <hjk@theqtcompany.com>

Start using (multi)markdown for it as well.

Change-Id: Ifa59eb29eaea859444e8eaf03954462744360032
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>

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

* Rename Instantiator
* Shorten some variable names

Change-Id: I0d1d6280b6157e9ebc4bbaaa77f462fe6ce233c4
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>

It is only used in LookupContext.cpp

Change-Id: I7b1b4a634fea8560102f2c17afcaacd2773de98a
Reviewed-by: Nikolai Kosjar <nikolai.kosjar@theqtcompany.com>

'bytes' has special meaning in Python.

Change-Id: I9ff7c56488c9d29e42b2c7a12e40b45815be2a76
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>

by using EditorManager::openEditorWithContents

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

Change-Id: I7a72a2f865148d7cf375897ec944a45f4b440818
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>

Change-Id: I996e4292a751f6570e3e645bfcabf00f8a168a59
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>

Change-Id: Ia273fda05a4c4a1934819f26e5dc1b6b80a89f6f
Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com>

... and use that in the Git client.

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

Change-Id: I64c4adf6fb8177a928fe6d95507bdfd795e8adbd
Task-number: QTCREATORBUG-14064
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>

Change-Id: If5733b37b123f261acfffb24cf9b81683c2d9118
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@theqtcompany.com>
Reviewed-by: Daniel Teske <daniel.teske@theqtcompany.com>

... and use that in Git as well.

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

Conflicts:
	src/plugins/cmakeprojectmanager/cmakeproject.cpp

Change-Id: I09c5a047f7d91fecfc58c78df438afcdcdc0a8d7

We have to make sure that the help engine is properly set up before
trying to read the bookmark data.

Change-Id: Id57cce5f538472eeac17b39a3640bf2ed77fa56a
Task-number: QTCREATORBUG-14106
Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>

Consistent with QVector etc.

Change-Id: Id616c9003c0d561ec941f9961dee122059d75dc3
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>

Change-Id: Ia773f4cc69f9554caeb78c1380ddf69095684000
Reviewed-by: Christian Stenger <christian.stenger@theqtcompany.com>
Reviewed-by: David Schulz <david.schulz@theqtcompany.com>

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

Was broken in 07d6757c

.

Change-Id: I2372d3856d52c01949554aed6ed133de8eabd814
Reviewed-by: André Hartmann <aha_1980@gmx.de>

Change-Id: Iae0779c1efa8b3b46cf504f7bda00d614a4a157e
Reviewed-by: André Hartmann <aha_1980@gmx.de>

Missed in 808f4492

.

Change-Id: I8760ab9fa897d708423b21c34771d5275f87d1d7
Reviewed-by: André Hartmann <aha_1980@gmx.de>

When a commit has several files, opening diff for the first file
works, but trying to open another diff without closing the previous
one doesn't refresh the diff editor.

Change-Id: Ia973cb70f2355a89b70787dd97042ef9f751d9d6
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Nikita Baryshnikov <nib952051@gmail.com>

... and rename it TypeResolver

Change-Id: I5cb076812d2e3ac132f18ea884ec69328b69999c
Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>

Task-number: QTCREATORBUG-14237
Change-Id: I59ae931994ef6577010a4544219ba3b0cd85c677
Reviewed-by: Przemyslaw Gorszkowski <pgorszkowski@gmail.com>

...when rebuilding the project tree.

Consider this product:
CppApplication { files: ["form.ui"] }

Now change it to this:
QtGuiApplication { files: ["form.ui"] }

The qbs file tags will now include "ui", so the Qt Creator
file type must change from "UnknownFileType" to "FormType". Therefore,
we need to replace the respective file node in the tree.

Change-Id: I6aa7e66d1af584e8ded2ffbb9b1215e8fc1135b8
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>

The aggregator doesn't own the models. They may live in separate
plugins and should be cleared from the code where they are created.

Change-Id: Icbde117561e530bd83fe752acd483e2c42692a1c
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>

To HEAD of 1.4 branch.

Change-Id: I989d723fcaf718d3502ee9047e9dd6048013244f
Reviewed-by: Joerg Bornemann <joerg.bornemann@theqtcompany.com>