Merge remote-tracking branch 'origin/4.1'

Change-Id: Ia442f30f387fe9292217582260bbe79e54608810
This commit is contained in:
Orgad Shaneh
2016-08-05 11:59:28 +03:00
committed by Ulf Hermann
125 changed files with 1416 additions and 1407 deletions

View File

@@ -2042,6 +2042,13 @@ void WatchHandler::notifyUpdateFinished()
foreach (auto item, toRemove)
m_model->destroyItem(item);
m_model->forAllItems([this](WatchItem *item) {
if (item->wantsChildren && isExpandedIName(item->iname)) {
m_model->m_engine->showMessage(QString("ADJUSTING CHILD EXPECTATION FOR " + item->iname));
item->wantsChildren = false;
}
});
m_model->m_contentsValid = true;
updateWatchersWindow();
m_model->reexpandItems();