feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity
Files
7121315a71bddb398c8f628c4343b33c0a1676f5
qt-creator/src/plugins/diffeditor/diffeditor.qbs

46 lines
1.2 KiB
QML
Raw Normal View History

use new base import style in qbs files Change-Id: Iecf32122df41f304ec6df538bb0dd8a263238a86 Reviewed-by: Jake Petroules <jake.petroules@petroules.com> Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-03-11 11:30:14 +01:00
import qbs 1.0
Experimental integration of DiffEditor After enabling the plugin go to Tools|Diff... Change-Id: I793b6faedb93f58039df0a62e82fe04a017978ee Reviewed-by: hjk <hjk121@nokiamail.com>
2013-02-15 12:49:50 +01:00
QtcPlugin {
name: "DiffEditor"
Depends { name: "Qt.widgets" }
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-10 13:02:33 +01:00
Depends { name: "Aggregation" }
Depends { name: "Utils" }
Experimental integration of DiffEditor After enabling the plugin go to Tools|Diff... Change-Id: I793b6faedb93f58039df0a62e82fe04a017978ee Reviewed-by: hjk <hjk121@nokiamail.com>
2013-02-15 12:49:50 +01:00
Depends { name: "Core" }
Depends { name: "TextEditor" }
files: [
diffeditor: Fix qbs build Change-Id: Ia657fbe20f51657295bfe657a88dab58c668c3f1 Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2013-06-04 17:35:11 +02:00
"diffeditor.cpp",
"diffeditor.h",
Implement unified diff editor Change-Id: I93e0bfd71a8a650afbe2ca9e0f1f3dbfc9d57db0 Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2014-02-13 16:43:28 +01:00
"diffeditor.qrc",
fix qbs build Change-Id: Ifb851fe09179b4822c53f528c793209226396c33 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-06-05 13:11:43 +02:00
"diffeditor_global.h",
"diffeditorconstants.h",
Add DiffEditorController Change-Id: Ic2f4a38d2ed08426ca7e5229d959b10fa545c129 Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>
2013-12-16 16:19:40 +01:00
"diffeditorcontroller.cpp",
"diffeditorcontroller.h",
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 13:31:11 +01:00
"diffeditordocument.cpp",
"diffeditordocument.h",
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-17 13:55:31 +02:00
"diffeditorfactory.cpp",
"diffeditorfactory.h",
Move Gui stuff out of DiffEditorController Place it in DiffEditorGuiController, will be needed for sharing gui settings between unified and sidebyside versions. Change-Id: I8a858d0549ff84e21f7c909288ca07c5a2ef4e5b Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2014-02-24 11:10:17 +01:00
"diffeditorguicontroller.cpp",
"diffeditorguicontroller.h",
Add DiffEditorManager, refactoring. GitDiffSwitcher operates now on IDocument. GitDiffHandler operates now on DiffEditorController. "source" property now attached to editor's document (VcsBasePlugin). Change-Id: Ie2570a597b8b992ac1dc33b9179eca459c8a751a Reviewed-by: Tobias Hunger <tobias.hunger@digia.com> Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2014-02-11 13:00:35 +01:00
"diffeditormanager.cpp",
"diffeditormanager.h",
Experimental integration of DiffEditor After enabling the plugin go to Tools|Diff... Change-Id: I793b6faedb93f58039df0a62e82fe04a017978ee Reviewed-by: hjk <hjk121@nokiamail.com>
2013-02-15 12:49:50 +01:00
"diffeditorplugin.cpp",
"diffeditorplugin.h",
Implement unified diff editor Change-Id: I93e0bfd71a8a650afbe2ca9e0f1f3dbfc9d57db0 Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2014-02-13 16:43:28 +01:00
"diffeditorreloader.cpp",
"diffeditorreloader.h",
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-07 14:02:08 +02:00
"differ.cpp",
"differ.h",
Move internal structures and some functions into diffutils.h Change-Id: Ia55e556fdb8de3a2aeebf768ad9db66d840766f2 Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2014-02-28 10:40:20 +01:00
"diffutils.cpp",
"diffutils.h",
qbs build fix: add selectabletexteditorwidget.cpp/h files Change-Id: Ic0c61924b3a39f6147565b31103807584e7a9598 Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
2014-06-13 16:31:28 +02:00
"selectabletexteditorwidget.cpp",
"selectabletexteditorwidget.h",
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 14:27:50 +01:00
"sidebysidediffeditorwidget.cpp",
"sidebysidediffeditorwidget.h",
Implement unified diff editor Change-Id: I93e0bfd71a8a650afbe2ca9e0f1f3dbfc9d57db0 Reviewed-by: Jarek Kobus <jaroslaw.kobus@digia.com>
2014-02-13 16:43:28 +01:00
"unifieddiffeditorwidget.cpp",
"unifieddiffeditorwidget.h",
Experimental integration of DiffEditor After enabling the plugin go to Tools|Diff... Change-Id: I793b6faedb93f58039df0a62e82fe04a017978ee Reviewed-by: hjk <hjk121@nokiamail.com>
2013-02-15 12:49:50 +01:00
]
}
Copy Permalink