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

49 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: "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" }
CodePaster: Register type safe service object Use Q_DECLARE_INTERFACE et al. This provides a way to have the dependency on code pasting optional in the using plugins (VCS, diff editor), while still being able to use a nice API to perform the pasting itself. Change-Id: Ia61e0066d552e45031f4aa7fd1f6693b68f92384 Reviewed-by: Christian Kandeler <christian.kandeler@theqtcompany.com> Reviewed-by: Tobias Hunger <tobias.hunger@theqtcompany.com> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@theqtcompany.com>
2015-06-29 14:22:17 +02:00
pluginRecommends: [
"CodePaster"
]
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
files: [
Move git specific stuff out of diff editor plugin Move it to the git plugin. Change-Id: I8151573ed50df70776f7ebf0475dd41fb84fae83 Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
2018-02-16 12:53:35 +01:00
"descriptionwidgetwatcher.cpp",
"descriptionwidgetwatcher.h",
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",
Add plugintr.h files to all plugins Except FakeVim, which had it before. for i in [a-eg-z]*/*.json ; do upper=${i##*/} upper=${upper/.json/} lower=${i%/*} trfile=$lower/${lower}tr.h cat << EOT > $lower/${lower}tr.h /**************************************************************************** ** ** Copyright (C) 2022 The Qt Company Ltd. ** Contact: https://www.qt.io/licensing/ ** ** This file is part of Qt Creator. ** ** Commercial License Usage ** Licensees holding valid commercial Qt licenses may use this file in ** accordance with the commercial license agreement provided with the ** Software or, alternatively, in accordance with the terms contained in ** a written agreement between you and The Qt Company. For licensing terms ** and conditions see https://www.qt.io/terms-conditions. For further ** information use the contact form at https://www.qt.io/contact-us. ** ** GNU General Public License Usage ** Alternatively, this file may be used under the terms of the GNU ** General Public License version 3 as published by the Free Software ** Foundation with exceptions as appearing in the file LICENSE.GPL3-EXCEPT ** included in the packaging of this file. Please review the following ** information to ensure the GNU General Public License requirements will ** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** ****************************************************************************/ namespace $upper { struct Tr { Q_DECLARE_TR_FUNCTIONS($upper) }; } // namespace $upper EOT git add $trfile perl -pi -e "s/(${lower}_global.h)/\1\n ${lower}tr.h/" $lower/CMakeLists.txt perl -pi -e "s/(\"${lower}_global.h\",)/\1 \"${lower}tr.h\",/" $lower/$lower.qbs done Change-Id: I15ebbaaa9443c57b391b9e143f592d8a0c9208a9 Reviewed-by: Eike Ziller <eike.ziller@qt.io>
2022-06-22 10:12:01 +02:00
"diffeditor_global.h", "diffeditortr.h",
fix qbs build Change-Id: Ifb851fe09179b4822c53f528c793209226396c33 Reviewed-by: Christian Kandeler <christian.kandeler@digia.com>
2013-06-05 13:11:43 +02:00
"diffeditorconstants.h",
Themed Icons: Introduce Utils::Icon Instead of describing icons via file name or in the themed icons case via a string that is a list of mask/color pairs, we have now a class for it. Icons are now listed in per-plugin *icons.h headers. RunControl::m_icon was The only place left where an icon property was in fact a string. This patch changes that member to be a Utils::Icon. Change-Id: Ibcfa8bb25e6d2e330c567ee7ccc0b97ead603177 Reviewed-by: Eike Ziller <eike.ziller@theqtcompany.com>
2015-11-23 16:41:54 +01:00
"diffeditoricons.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",
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",
Refactor DiffEditorWidgets, introduce common widget controller Reduce code repetition. Change-Id: I416555dd83ce888088a6a259777c294a6feb35f4 Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2016-07-13 15:55:18 +02:00
"diffeditorwidgetcontroller.cpp",
"diffeditorwidgetcontroller.h",
SideBySideDiffEditor: Avoid code repetition Change-Id: Ie49834a4896dbf32a87329345e52dc99ca2f86bd Reviewed-by: Orgad Shaneh <orgads@gmail.com>
2022-09-29 14:25:34 +02:00
"diffenums.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",
DiffEditor: Introduce a base class for the different views ... of the diff. Currently that is side-by-side and unified, just as before. Change-Id: I62a5462344c4b4ae652899f9d5b2936aa5a692b8 Reviewed-by: Jarek Kobus <jaroslaw.kobus@theqtcompany.com>
2015-01-30 16:10:04 +01:00
"diffview.cpp",
"diffview.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