diff --git a/src/widgets/itemviews/qabstractitemdelegate.cpp b/src/widgets/itemviews/qabstractitemdelegate.cpp
index 59caed1699..23e8ef0901 100644
--- a/src/widgets/itemviews/qabstractitemdelegate.cpp
+++ b/src/widgets/itemviews/qabstractitemdelegate.cpp
@@ -514,6 +514,14 @@ bool QAbstractItemDelegatePrivate::tryFixup(QWidget *editor)
             return e->hasAcceptableInput();
         }
     }
+#endif
+#if QT_CONFIG(spinbox)
+    // Give a chance to the spinbox to interpret the text and emit
+    // the appropriate signals before committing data.
+    if (QAbstractSpinBox *sb = qobject_cast<QAbstractSpinBox *>(editor)) {
+        if (!sb->keyboardTracking())
+            sb->interpretText();
+    }
 #else
     Q_UNUSED(editor);
 #endif // QT_CONFIG(lineedit)
diff --git a/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp b/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp
index 9b8948001d..172fe99e2f 100644
--- a/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp
+++ b/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp
@@ -147,6 +147,8 @@ private slots:
     void inputMethodOpensEditor();
     void selectionAutoScrolling_data();
     void selectionAutoScrolling();
+    void testSpinBoxAsEditor_data();
+    void testSpinBoxAsEditor();
 
 private:
     static QAbstractItemView *viewFromString(const QByteArray &viewType, QWidget *parent = nullptr)
@@ -3403,6 +3405,62 @@ void tst_QAbstractItemView::selectionAutoScrolling()
 
     QTest::mouseRelease(listview.viewport(), Qt::LeftButton, Qt::NoModifier, dragPoint);
 }
+class SpinBoxDelegate : public QStyledItemDelegate
+{
+public:
+    using QStyledItemDelegate::QStyledItemDelegate;
+    QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &, const QModelIndex &) const override
+    {
+        QSpinBox *spinboxEditor = new QSpinBox(parent);
+        return spinboxEditor;
+    }
+
+    void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const override
+    {
+        if (QSpinBox *spin = qobject_cast<QSpinBox *>(editor)) {
+            model->setData(index, spin->value());
+        }
+    }
+};
+
+void tst_QAbstractItemView::testSpinBoxAsEditor_data()
+{
+    QTest::addColumn<bool>("keyboardTracking");
+    QTest::newRow("true") << true;
+    QTest::newRow("false")<< false;
+}
+
+void tst_QAbstractItemView::testSpinBoxAsEditor()
+{
+    QFETCH(bool, keyboardTracking);
+
+    QStandardItemModel model(2, 2);
+    SpinBoxDelegate delegate;
+
+    QTableView view;
+    view.setModel(&model);
+    view.setItemDelegate(&delegate);
+
+    view.setCurrentIndex(model.index(0, 1));
+    view.openPersistentEditor(model.index(0, 1));
+    const QList<QSpinBox *> list = view.viewport()->findChildren<QSpinBox *>();
+    QCOMPARE(list.size(), 1);
+    QSpinBox *sb = list.first();
+    QVERIFY(sb);
+
+    sb->setKeyboardTracking(keyboardTracking);
+
+    centerOnScreen(&view);
+    view.show();
+    QVERIFY(QTest::qWaitForWindowExposed(&view));
+    QTRY_COMPARE(QApplication::focusWidget(), sb);
+
+    QTest::keyClick(sb, Qt::Key_1, Qt::NoModifier);
+    QPoint clickpos = view.visualRect(model.index(0, 0)).center();
+    QTest::mouseDClick(view.viewport(), Qt::LeftButton, Qt::NoModifier, clickpos);
+
+    QCOMPARE(model.data(model.index(0, 1)).toInt(), 1);
+}
 
 QTEST_MAIN(tst_QAbstractItemView)
 #include "tst_qabstractitemview.moc"