1 files changed, 24 insertions, 0 deletions
diff --git a/tests/auto/qtreewidget/tst_qtreewidget.cpp b/tests/auto/qtreewidget/tst_qtreewidget.cpp
index c3595c2c46..32a2c40b94 100644
--- a/tests/auto/qtreewidget/tst_qtreewidget.cpp
+++ b/tests/auto/qtreewidget/tst_qtreewidget.cpp
@@ -136,6 +136,7 @@ private slots:
     void rootItemFlags();
     void task218661_setHeaderData();
     void task245280_sortChildren();
+    void task253109_itemHeight();
 
     // QTreeWidgetItem
     void itemOperatorLessThan();
@@ -2433,6 +2434,10 @@ void tst_QTreeWidget::itemOperatorLessThan()
         item1.setText(0, "b");
         item2.setText(0, "a");
         QCOMPARE(item1 < item2, true);
+        tw.sortItems(0, Qt::AscendingOrder);
+        item1.setData(0, Qt::DisplayRole, 11);
+        item2.setData(0, Qt::DisplayRole, 2);
+        QCOMPARE(item1 < item2, false);
     }
 }
 
@@ -2879,6 +2884,25 @@ void tst_QTreeWidget::task245280_sortChildren()
         QCOMPARE(top.child(i)->text(1), QString::number(i));
 }
 
+void tst_QTreeWidget::task253109_itemHeight()
+{
+    QTreeWidget treeWidget;
+    treeWidget.setColumnCount(1);
+    treeWidget.show();
+    QTest::qWait(200);
+
+    QTreeWidgetItem item(&treeWidget);
+    class MyWidget : public QWidget
+    {
+        virtual QSize sizeHint() const { return QSize(200,100); }
+    } w;
+    treeWidget.setItemWidget(&item, 0, &w);
+
+    QTest::qWait(200);
+    QCOMPARE(w.geometry(), treeWidget.visualItemRect(&item));
+
+}
+
 void tst_QTreeWidget::task206367_duplication()
 {
     QTreeWidget treeWidget;