Merge remote-tracking branch 'origin/2.5'

Conflicts:
	share/share.qbs

Change-Id: Ia64573d1a69b9063fee32496a3f0a00926a3dadd
This commit is contained in:
Eike Ziller
2012-04-03 10:03:52 +02:00
19 changed files with 1027 additions and 731 deletions

View File

@@ -399,6 +399,7 @@ void TaskWindow::showTask(unsigned int id)
QModelIndex sourceIdx = d->m_model->index(sourceRow, 0);
QModelIndex filterIdx = d->m_filter->mapFromSource(sourceIdx);
d->m_listview->setCurrentIndex(filterIdx);
popup(false);
}
void TaskWindow::openTask(unsigned int id)