GitLab

In most cases, the *Editor constructor does not need to
access the *EditorWidget.

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

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

If the vcs::open fail, we should fall back to setPermissions.

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

A more direct approach than going through the widget's baseTextDocument,
relying on widget life time.

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

This change also adds a AbstractMacroExpander for the QtKitInformation.

It supports the following variables in the Kit display name:

 %{Qt:version} - Qt version number
 %{Qt:type}    - Qt type
 %{Qt:name}    - Qt version name
 %{Qt:mkspec}  - mkspec used by the Qt version

Task-number: QTCREATORBUG-11118
Change-Id: I7263781336ab561c34880b187ebd55e81e6ca215
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>

Following the new simple-factory pattern

Change-Id: Idceb7a339169af37a040f9da7d36d3fe22dfb347
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>

This does not seem to be necessary at all (it's overwritten on each
and every setDisplaySetting() call) and is the only remaining
difference in the two remaning BaseTextEditorWidget constructor bodies.

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

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

This is the first step in actually making "closeEditor(s)" close editors
instead of documents.

Change-Id: I02761e0cef950b8fc093f65a90df04a9a7550681
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
Reviewed-by: hjk <hjk121@nokiamail.com>

Update file path and global marks if file in project is renamed.

Update file path on "Save as...".

Task-number: QTCREATORBUG-12810
Change-Id: Ia2361e8f65a7a494e339d96c8b4610af4ab38edb
Reviewed-by: hjk <hjk121@nokiamail.com>

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

Detected by CppCheck

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

Detected by CppCheck.

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

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

closeEditor(Entry) -> closeDocument(Entry)

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

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

Task-number: QTCREATORBUG-12804
Change-Id: If370056cd0cda1f02558cbd02134a12877d5ce3d
Reviewed-by: Robert Loehning <robert.loehning@digia.com>
Reviewed-by: Daniel Teske <daniel.teske@digia.com>

The fact that the separate JavaScript view only works with versions of
Qt that use the V8 JavaScript engine is frequently confusing users.
JavaScript events for newer versions of Qt are integrated into the
Events and Timeline views, making the separate JavaScript view obsolete.
For those users who already know it and who are still using Qt 5.0 and
5.1 "V8" will be recognizable. For others "V8" won't mean anything and
they'll ignore it.

Change-Id: Iac0d89db24a3677e47b978a152cfc25c01f9c2b6
Task-number: QTCREATORBUG-12766
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com>
Reviewed-by: Robert Loehning <robert.loehning@digia.com>

Example:
struct Foo { int foo; };
typedef Foo *FooArr[10];

void func()
{
    FooArr arr;
    arr[0]-> // No completion
}

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

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

The VCS plugins keep a reference to the submit editor, so it can
explicitly be closed, instead of relying on the correct currentEditor in
the editor manager.

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

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>

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>

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>

Bug in change 9795976a

Task-number: QTCREATORBUG-12770
Change-Id: I6034f7df9ef1159f0ce39d2784bda2755fefd829
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>

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