QFontComboBox: used to emit currentFontChanged twice when setting it.

Setting the current font would change the current font and then it
would try to select the right model index and get the font only from
the text of the combobox. This was resetting the point size of the font,
resulting in emitting the signal a second time.
In the case of the user, it was also causing signals to be called in
a loop.

Task-number: 229731

2 files changed, 6 insertions, 2 deletions

diff --git a/src/gui/widgets/qfontcombobox.cpp b/src/gui/widgets/qfontcombobox.cpp
index 9660399..f87ccd3 100644
--- a/src/gui/widgets/qfontcombobox.cpp
+++ b/src/gui/widgets/qfontcombobox.cpp
@@ -263,7 +263,7 @@ void QFontComboBoxPrivate::_q_currentChanged(const QString &text)
 {
     Q_Q(QFontComboBox);
     QFont newFont(text);
-    if (currentFont != newFont) {
+    if (currentFont.family() != newFont.family()) {
         currentFont = newFont;
         emit q->currentFontChanged(currentFont);
     }
diff --git a/tests/auto/qfontcombobox/tst_qfontcombobox.cpp b/tests/auto/qfontcombobox/tst_qfontcombobox.cpp
index 62bfdf7..e2515ae 100644
--- a/tests/auto/qfontcombobox/tst_qfontcombobox.cpp
+++ b/tests/auto/qfontcombobox/tst_qfontcombobox.cpp
@@ -122,7 +122,10 @@ void tst_QFontComboBox::currentFont_data()
 {
     QTest::addColumn<QFont>("currentFont");
     // Normalize the names
-    QTest::newRow("default") << QFont(QFontInfo(QFont()).family());
+    QFont defaultFont;
+    QTest::newRow("default") << defaultFont;
+    defaultFont.setPointSize(defaultFont.pointSize() + 10);
+    QTest::newRow("default") << defaultFont;
     QFontDatabase db;
     QStringList list = db.families();
     for (int i = 0; i < list.count(); ++i) {
@@ -141,6 +144,7 @@ void tst_QFontComboBox::currentFont()
     QFont oldCurrentFont = box.currentFont();
 
     box.setCurrentFont(currentFont);
+    QCOMPARE(box.currentFont(), currentFont);
     QString boxFontFamily = QFontInfo(box.currentFont()).family();
     QRegExp foundry(" \\[.*\\]");
     if (!currentFont.family().contains(foundry))