Tobias Hunger
8c1c284789
Qbs/qmake: Fix dependencies of plugins
...
... based on output from dependencyinfo.py script
Change-Id: I9532f6d259f15c16b62fae0ca18f8a8cad95bd11
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com >
Reviewed-by: Christian Stenger <christian.stenger@digia.com >
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2014-02-11 13:23:26 +01:00
Jarek Kobus
edac8f082d
Get rid of DiffShowEditor.
...
Made DiffEditor customizable instead
Change-Id: If92799d47c7e731febb45197384c082eb3af55df
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com >
2014-01-30 19:13:48 +01:00
Jarek Kobus
c18fa9112b
Rename DiffEditorWidget -> SideBySideDiffEditorWidget
...
It's the preparation for the new UnifiedDiffEditorWidget
Change-Id: I018899017c7e711ea8b04d85f8298b0d73f1cbab
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com >
2014-01-30 17:13:14 +01:00
Jarek Kobus
65087004de
Rename DiffEditorFile -> DiffEditorDocument
...
The old name had nothing to do with a file in fact.
The new name will be more appropriate for the new stuff,
which will come soon.
Change-Id: I17ad03dab5c643ff26e313a434ba86929a0f00c3
Reviewed-by: Eike Ziller <eike.ziller@digia.com >
2014-01-30 14:50:31 +01:00
jkobus
a74b59ffd6
Add DiffEditorController
...
Change-Id: Ic2f4a38d2ed08426ca7e5229d959b10fa545c129
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2014-01-16 14:36:53 +01:00
hjk
4d96fa7aba
Core: Merge Find and Locator into Core plugin
...
Change-Id: I7053310272235d854c9f409670ff52a10a7add8b
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com >
Reviewed-by: Orgad Shaneh <orgads@gmail.com >
Reviewed-by: Eike Ziller <eike.ziller@digia.com >
2014-01-14 07:43:00 +01:00
Christian Kandeler
f1da03c73b
qbs project files: Make use of new qbsSearchPaths property.
...
Change-Id: I396d970fafea1fd0b4c4d73883796662a1d0064b
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com >
2013-10-09 18:08:56 +02:00
jkobus
f5a2c1469a
Add a DiffShowEditor showing an additional info
...
Task-number: QTCREATORBUG-9489
Change-Id: I3ae2e59ccaf397f4236505f21e027a42e2798784
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
Reviewed-by: Leena Miettinen <riitta-leena.miettinen@digia.com >
Reviewed-by: Petar Perisin <petar.perisin@gmail.com >
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com >
2013-06-19 09:11:42 +02:00
Joerg Bornemann
67399fc02a
fix qbs build
...
Change-Id: Ifb851fe09179b4822c53f528c793209226396c33
Reviewed-by: Christian Kandeler <christian.kandeler@digia.com >
2013-06-05 16:34:23 +02:00
Eike Ziller
9d0346a373
diffeditor: Fix qbs build
...
Change-Id: Ia657fbe20f51657295bfe657a88dab58c668c3f1
Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com >
2013-06-05 09:16:18 +02:00
Eike Ziller
8d894aee02
Merge remote-tracking branch 'origin/2.7' into 2.8
...
Conflicts:
src/plugins/analyzerbase/analyzerbase.qbs
src/plugins/qmljseditor/qmljseditor.qbs
src/plugins/qt4projectmanager/qt4projectmanager.qbs
Change-Id: If9db8894ed27401a9aa9b385a6117be4c38edd11
2013-05-28 18:28:00 +02:00
Christian Kandeler
24e81241a5
Remove duplicate module dependencies from qbs files.
...
These cause a warning now.
Change-Id: I4c4e9c3e11e7f97e66a4bcdd708489fafc8f0606
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com >
2013-05-27 17:59:12 +02:00
jkobus
97a86c50dc
Basic integration of diff editor inside git plugin
...
Change-Id: I7675fc1d994020f94f42f6bd7b4f75aa29e6edf6
Reviewed-by: David Schulz <david.schulz@digia.com >
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com >
2013-05-15 16:24:38 +02:00
jkobus
0e91d10878
Experimental integration of DiffEditor
...
After enabling the plugin go to Tools|Diff...
Change-Id: I793b6faedb93f58039df0a62e82fe04a017978ee
Reviewed-by: hjk <hjk121@nokiamail.com >
2013-02-18 18:15:51 +01:00
