1 files changed, 24 insertions, 0 deletions
diff --git a/tests/auto/qcombobox/tst_qcombobox.cpp b/tests/auto/qcombobox/tst_qcombobox.cpp
index e881496..620cd07 100644
--- a/tests/auto/qcombobox/tst_qcombobox.cpp
+++ b/tests/auto/qcombobox/tst_qcombobox.cpp
@@ -76,6 +76,7 @@
 #endif
 #include <qabstractitemview.h>
 #include "../../shared/util.h"
+#include <qstyleditemdelegate.h>
 
 //TESTED_CLASS=
 //TESTED_FILES=
@@ -141,6 +142,8 @@ private slots:
     void setModelColumn();
     void noScrollbar_data();
     void noScrollbar();
+    void setItemDelegate();
+    void task253944_itemDelegateIsReset();
 
 protected slots:
     void onEditTextChanged( const QString &newString );
@@ -2209,5 +2212,26 @@ void tst_QComboBox::noScrollbar()
     }
 }
 
+void tst_QComboBox::setItemDelegate()
+{
+    QComboBox comboBox;
+    QStyledItemDelegate *itemDelegate = new QStyledItemDelegate;
+    comboBox.setItemDelegate(itemDelegate);
+    QCOMPARE(comboBox.itemDelegate(), itemDelegate);
+}
+
+void tst_QComboBox::task253944_itemDelegateIsReset()
+{
+    QComboBox comboBox;
+    QStyledItemDelegate *itemDelegate = new QStyledItemDelegate;
+    comboBox.setItemDelegate(itemDelegate);
+
+    comboBox.setEditable(true);
+    QCOMPARE(comboBox.itemDelegate(), itemDelegate);
+
+    comboBox.setStyleSheet("QComboBox { border: 1px solid gray; }");
+    QCOMPARE(comboBox.itemDelegate(), itemDelegate);
+}
+
 QTEST_MAIN(tst_QComboBox)
 #include "tst_qcombobox.moc"