ui: Immediately delete unused QSeletionModels

This is a workaround for QTBUG-49966, as we don't want to keep replaced selection models around.
zealdocs · Jan 21, 2018 · 1433063 · 1433063
1 parent 2a2627a
commit 1433063
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/src/libs/ui/mainwindow.cpp b/src/libs/ui/mainwindow.cpp
@@ -551,15 +551,21 @@ void MainWindow::duplicateTab(int index)
 
 void MainWindow::syncTreeView()
 {
-    TabState *tabState = currentTabState();
+    QItemSelectionModel *oldSelectionModel = ui->treeView->selectionModel();
 
-    if (!tabState->searchQuery.isEmpty()) {
-        ui->treeView->setModel(tabState->searchModel);
-        ui->treeView->setRootIsDecorated(false);
-    } else {
+    TabState *tabState = currentTabState();
+    if (tabState->searchQuery.isEmpty()) {
         ui->treeView->setModel(m_zealListModel);
-        ui->treeView->setColumnHidden(1, true);
         ui->treeView->setRootIsDecorated(true);
+    } else {
+        ui->treeView->setModel(tabState->searchModel);
+        ui->treeView->setRootIsDecorated(false);
+    }
+
+    // TODO: Remove once QTBUG-49966 is addressed.
+    QItemSelectionModel *newSelectionModel = ui->treeView->selectionModel();
+    if (oldSelectionModel && newSelectionModel != oldSelectionModel) {
+        oldSelectionModel->deleteLater();
     }
 
     ui->treeView->reset();