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

Merge remote-tracking branch 'origin/4.8'

Browse Source 
Conflicts:
	src/plugins/debugger/debuggermainwindow.cpp
	src/plugins/qbsprojectmanager/qbsbuildstep.cpp
	src/plugins/winrt/winrtdevicefactory.cpp
	tests/unit/unittest/gtest-creator-printing.cpp
	tests/unit/unittest/gtest-creator-printing.h
	tests/unit/unittest/unittest.pro

Change-Id: Ie9b80b87a8a4fa81baf72a2daa7919b21371c15e
This commit is contained in:
Eike Ziller
2018-11-06 09:20:00 +01:00
parent 9d296cf1f1 e18cbad285
commit 1473bc5891
229 changed files with 5356 additions and 2822 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/git/branchview.cpp
View File

@@ -126,6 +126,9 @@ BranchView::BranchView() :
this, &BranchView::BranchView::setIncludeTags);
m_branchView->setContextMenuPolicy(Qt::CustomContextMenu);
m_branchView->setEditTriggers(QAbstractItemView::SelectedClicked
| QAbstractItemView::EditKeyPressed);
m_branchView->setItemDelegate(new BranchValidationDelegate(this, m_model));
connect(m_branchView, &QAbstractItemView::doubleClicked,
this, [this](const QModelIndex &idx) { log(m_filterModel->mapToSource(idx)); });
connect(m_branchView, &QWidget::customContextMenuRequested,
@@ -194,7 +197,7 @@ void BranchView::slotCustomContextMenu(const QPoint &point)
const QModelIndex index = m_filterModel->mapToSource(filteredIndex);
const QModelIndex currentBranch = m_model->currentBranch();
const bool currentSelected = index.row() == currentBranch.row();
const bool currentSelected = index.sibling(index.row(), 0) == currentBranch;
const bool isLocal = m_model->isLocal(index);
const bool isTag = m_model->isTag(index);
const bool hasActions = m_model->isLeaf(index);
@@ -432,7 +435,6 @@ bool BranchView::remove()
bool BranchView::rename()
{
const QModelIndex selected = selectedIndex();
QTC_CHECK(selected != m_model->currentBranch());
const bool isTag = m_model->isTag(selected);
QTC_CHECK(m_model->isLocal(selected) || isTag);