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

Merge remote-tracking branch 'origin/4.1'

Browse Source 
Change-Id: I80f96f100046625f24b6ab5d13fdb05660365abc
This commit is contained in:
Eike Ziller
2016-08-22 16:30:49 +02:00
parent f41b48ef5d e87da5a08a
commit 841778ed69
19 changed files with 78 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/help/docsettingspage.cpp
View File

@@ -27,6 +27,7 @@
#include "helpconstants.h"
#include <coreplugin/helpmanager.h>
#include <utils/algorithm.h>
#include <QFileDialog>
#include <QKeyEvent>
@@ -287,8 +288,12 @@ void DocSettingsPage::removeDocumentation(const QList<QModelIndex> &items)
if (items.isEmpty())
return;
for (int i = items.size() - 1; i >= 0; --i) {
const int row = items.at(i).row();
QList<QModelIndex> itemsByDecreasingRow = items;
Utils::sort(itemsByDecreasingRow, [](const QModelIndex &i1, const QModelIndex &i2) {
return i1.row() > i2.row();
});
foreach (const QModelIndex &item, itemsByDecreasingRow) {
const int row = item.row();
const QString nameSpace = m_model->entryAt(row).nameSpace;
m_filesToRegister.remove(nameSpace);
@@ -298,7 +303,7 @@ void DocSettingsPage::removeDocumentation(const QList<QModelIndex> &items)
m_model->removeAt(row);
}
const int newlySelectedRow = qMax(items.first().row() - 1, 0);
const int newlySelectedRow = qMax(itemsByDecreasingRow.last().row() - 1, 0);
const QModelIndex index = m_proxyModel->mapFromSource(m_model->index(newlySelectedRow));
m_ui.docsListView->selectionModel()->select(index, QItemSelectionModel::ClearAndSelect);
}