diff options
| author | Andre Hartmann <[email protected]> | 2018-02-18 17:15:06 +0100 |
|---|---|---|
| committer | André Hartmann <[email protected]> | 2018-09-12 18:24:52 +0000 |
| commit | e543ef5eb10c48c57914280bd95fe2f3e4a6e843 (patch) | |
| tree | 6f8e2cf5a85c45ce97ad75b36cb049616906e196 /src/plugins/git/git.pro | |
| parent | b173c3d83f27b6d21607381ecada2d1ba7aff2df (diff) | |
Git: Replace branch dialog with branches side panel
This allows all kind of typical Git workflow (rebasing,
merging, cherry-picking) without having the branches dialog
on top of all windows.
Task-number: QTCREATORBUG-19618
Change-Id: Iab078d79a589ff60fa8385c98ec2a23b352c084c
Reviewed-by: Orgad Shaneh <[email protected]>
Diffstat (limited to 'src/plugins/git/git.pro')
| -rw-r--r-- | src/plugins/git/git.pro | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/plugins/git/git.pro b/src/plugins/git/git.pro index d2aec997468..d7a7454c74c 100644 --- a/src/plugins/git/git.pro +++ b/src/plugins/git/git.pro @@ -14,7 +14,6 @@ HEADERS += gitplugin.h \ gitsubmiteditor.h \ gitversioncontrol.h \ gitsettings.h \ - branchdialog.h \ branchmodel.h \ stashdialog.h \ gitutils.h \ @@ -26,7 +25,8 @@ HEADERS += gitplugin.h \ branchcheckoutdialog.h \ githighlighters.h \ gitgrep.h \ - branchutils.h + branchutils.h \ + branchview.h SOURCES += gitplugin.cpp \ gitclient.cpp \ @@ -39,7 +39,6 @@ SOURCES += gitplugin.cpp \ gitsubmiteditor.cpp \ gitversioncontrol.cpp \ gitsettings.cpp \ - branchdialog.cpp \ branchmodel.cpp \ stashdialog.cpp \ gitutils.cpp \ @@ -51,12 +50,12 @@ SOURCES += gitplugin.cpp \ branchcheckoutdialog.cpp \ githighlighters.cpp \ gitgrep.cpp \ - branchutils.cpp + branchutils.cpp \ + branchview.cpp FORMS += changeselectiondialog.ui \ settingspage.ui \ gitsubmitpanel.ui \ - branchdialog.ui \ stashdialog.ui \ remotedialog.ui \ remoteadditiondialog.ui \ |