Merge remote-tracking branch 'origin/5.12' into 5.13

Change-Id: I0015980f763599ca60f28dd3408531d2a532cd6a

1 files changed, 14 insertions, 7 deletions

diff --git a/src/distancefieldgenerator/mainwindow.cpp b/src/distancefieldgenerator/mainwindow.cpp
index ee4475ada..6bc793ede 100644
--- a/src/distancefieldgenerator/mainwindow.cpp
+++ b/src/distancefieldgenerator/mainwindow.cpp
@@ -693,18 +693,25 @@ void MainWindow::updateUnicodeRanges()
                this,
                &MainWindow::updateSelection);
 
+    QItemSelection selectedItems;
+
     for (int i = 0; i < ui->lwUnicodeRanges->count(); ++i) {
         QListWidgetItem *item = ui->lwUnicodeRanges->item(i);
-        DistanceFieldModel::UnicodeRange unicodeRange = item->data(Qt::UserRole).value<DistanceFieldModel::UnicodeRange>();
-        QList<glyph_t> glyphIndexes = m_model->glyphIndexesForUnicodeRange(unicodeRange);
-        for (glyph_t glyphIndex : glyphIndexes) {
-            QModelIndex index = m_model->index(glyphIndex);
-            ui->lvGlyphs->selectionModel()->select(index, item->isSelected()
-                                                            ? QItemSelectionModel::Select
-                                                            : QItemSelectionModel::Deselect);
+        if (item->isSelected()) {
+            DistanceFieldModel::UnicodeRange unicodeRange = item->data(Qt::UserRole).value<DistanceFieldModel::UnicodeRange>();
+            QList<glyph_t> glyphIndexes = m_model->glyphIndexesForUnicodeRange(unicodeRange);
+
+            for (glyph_t glyphIndex : glyphIndexes) {
+                QModelIndex index = m_model->index(glyphIndex);
+                selectedItems.select(index, index);
+            }
         }
     }
 
+    ui->lvGlyphs->selectionModel()->clearSelection();
+    if (!selectedItems.isEmpty())
+        ui->lvGlyphs->selectionModel()->select(selectedItems, QItemSelectionModel::Select);
+
     connect(ui->lvGlyphs->selectionModel(),
             &QItemSelectionModel::selectionChanged,
             this,