feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

BranchView: Return recipe instead of TaskTree

Browse Source 
Change-Id: I51c6c4f7d03f264e69c637f081017d88a5ac027b
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Jarek Kobus
2024-01-13 17:38:25 +01:00
parent 1bf2c447d3
commit 34b01f7530
2 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/git/branchview.h
View File

@@ -17,7 +17,7 @@ class QToolButton;
class QTreeView;
QT_END_NAMESPACE;
namespace Tasking { class TaskTree; }
namespace Tasking { class Group; }
namespace Utils {
class ElidingLabel;
@@ -56,7 +56,7 @@ private:
bool remove();
bool rename();
bool reset(const QByteArray &resetType);
Tasking::TaskTree *onFastForwardMerge(const std::function<void()> &callback);
Tasking::Group fastForwardMergeRecipe(const std::function<void()> &callback);
bool merge(bool allowFastForward);
void rebase();
bool cherryPick();