GitLab

Conflicts:
	qtcreator.pri
	qtcreator.qbs
	src/plugins/coreplugin/editormanager/editormanager.cpp
	src/plugins/projectexplorer/editorconfiguration.cpp
	src/plugins/projectexplorer/projectfilewizardextension.cpp
	src/plugins/qmakeandroidsupport/createandroidmanifestwizard.cpp

Change-Id: I8de0f6fcdd8d214fbc14e79f74cb0206e6e2c6c1

We need to pass the _path_ of the file to
findVersionControlForDirectory, excluding the file name.
This broke the ClearCase plugin tests, which rely on magic top level
directory length sorting behavior.

Change-Id: I93e993d9461cc571ea1ae8070eb8d465ad004b9c
Reviewed-by: Christian Stenger <christian.stenger@digia.com>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

I keep losing the second mouseClick in tst_create_proj_wizard...

Change-Id: I45f37c848c7eccd9fd59c455e8d6c80c6de88c06
Reviewed-by: Christian Stenger <christian.stenger@digia.com>

The comparison operator was not consistent if comparing the same url.
This could trigger an assert for msvc debug builds.

Change-Id: Ia9febd7ffd7d0f4dbb64184931a526e61f020672
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>

The case from the bug report is:
/
 --> project.pro
 --> src
     --> foo.qrc
     --> folder
         --> file added here

Since the .qrc file is nearer then the .pro file, it was selected as the default node.
This patch makes the priority for the .qrc node -1 if it's a unmatched mime type.
That means a .qrc node will only be the default if it's either a image, a .qml or a .js
file.

Task-number: QTCREATORBUG-12793
Change-Id: I7328fd6359cc2e1959ab0bda831bd77de117baff
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

The model can already be detached when calling delayedReset.
In this case we just do nothing.

Change-Id: I889fcc4e267dac3403c2e35b8f77b1e4fb5b8050
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>

To HEAD of 1.3 branch.

Change-Id: I93178253701239414ea83ec04ce54619020d2706
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

Task-number: QTCREATORBUG-11930
Change-Id: Id09b71759a1fe67c558500a2a460669f708b1dee
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>

Task-number: QTCREATORBUG-12394
Change-Id: I827fb894fd373b34cbae19f686b15acb697489c3
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

Task-number: QTCREATORBUG-11930
Change-Id: I0566fe2ef1d6e5ad9d99256d8a57a8e876a2e0c1
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

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

A JavaScript file with .pragma library is everything else but
"stateless". Just call it a "JavaScript library".
Also see commit 7ee8156116581e08466ebc23b31e2b76c127e742 in
qtdeclarative.

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

It helps when savingAs vcs diffs for the first time.

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

Path 'snippets' does not exist.

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

Test crashed when there was unexpected output

Change-Id: I6fd56bf95d664cff5284e574db9b57f42b0e93cf
Reviewed-by: Christian Stenger <christian.stenger@digia.com>

Bug in change 9795976a

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

Change-Id: I35ff3e1cf99a8e5f171f0728f05a3b828da78293
Reviewed-by: Christian Stenger <christian.stenger@digia.com>

Change-Id: I1da64859bf5d6974ceacfe22d230be1983533d77
Reviewed-by: Christian Stenger <christian.stenger@digia.com>

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

Change-Id: Ie28d5901fe27fec4f928204296bf1013e10c556a
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

Task-number: QTCREATORBUG-12814
Change-Id: I84d2ae60b8362b6fef45283c36aef1b8a20dbd95
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

Instead of showing 3-way diff, show simple diff
of conflicted file compared to the head of current branch.

Task-number: QTCREATORBUG-10099
Change-Id: I9419236f0249fd2752f89ea80a2a644fb80af095
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

Change-Id: I2372ffc07a101110c9c3016c7d18b9d182312954
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

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

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

Task-number: QTCREATORBUG-12650
Change-Id: I0bb25ed39f8a15dd5da798ebf0ce72898a2e3b3d
Reviewed-by: Eike Ziller <eike.ziller@digia.com>

There are now two ways to see long file paths.

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

Change-Id: I38f53d98159e15340b2f6cbc1912c6e15242dc5b
Reviewed-by: Christian Stenger <christian.stenger@digia.com>

Task-number: QTCREATORBUG-12288
Change-Id: Ie5195fd3447bcedc4f7fd0515bedb524b5d96663
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

Task-number: QTCREATORBUG-12755
Change-Id: Idc4427425a3ef3e70c8738f1062e20d50bab69ca
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

To HEAD of 1.3 branch.

Change-Id: I36c24e180b72b49d392380e20bc98e83f7754684
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

Change-Id: I5c89b7d3806c68295a5304a6dbe7592a7e874d47
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

Change-Id: I61bc0c9c9e5fc0811d776cb3a7bc8134f878d6a2
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

Change-Id: Iede96bf4c12579ee84524130aaa174ee40991cf2
Reviewed-by: Tasuku Suzuki <stasuku@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>

Removing those only from combobox is not sufficient because the
template list is accessed by current index of the combobox at several
places.

Change-Id: I1127159d010d87dff55c14b7ee1ce5497a1cc05c
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>

It will take over more responsibility in a later patch.

Change-Id: I89ef61791ccbba3e42de2862d5d887099634bce4
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

As opposed to gcc, we can't just invoke the compiler binary for linking.

Task-number: QTCREATORBUG-12824
Change-Id: Icdf8b7217b14976a7a4249b5d0c5cc5f76ffdd9f
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

The width of the flickable element may be different from the width of
the timeline renderer because the flickable can have a scrollbar. This
is the same principle as in b3348dae .

Change-Id: Ife0064c4226ecff0e99d3d6aaf7a104b3c46e751
Task-number: QTCREATORBUG-12822
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>

Happens to me with binary packages for Linux.

Change-Id: I688103ba2df26056468e89271e815b5717effeee
Reviewed-by: Christian Stenger <christian.stenger@digia.com>

For consistency and to avoid unforeseen side effects.

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