diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2016-12-01 12:51:02 +0100 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2016-12-01 12:21:56 +0000 |
| commit | 2503a1e9e7a33c9a69eb134ba59711078255ca4c (patch) | |
| tree | c49ac2f3aa98530841a2d6e278f2c81c2080592b /tests/auto/widgets/widgets/qcombobox | |
| parent | fec08545ff0b4fb2ce68a7d7502273a599472141 (diff) | |
Fix tst_QComboBox::getSetCheck()
Change 2fd3d8ea9e3e1829653942431070a83569bab6eb broke the QCOMPARE()
in there, partially revert.
Change-Id: I8f572b9d82ad1c6b5448504eda7cc2fa53fa3d3d
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@qt.io>
Diffstat (limited to 'tests/auto/widgets/widgets/qcombobox')
| -rw-r--r-- | tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp index 122d320d18..3afdc0a12a 100644 --- a/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp +++ b/tests/auto/widgets/widgets/qcombobox/tst_qcombobox.cpp @@ -312,10 +312,10 @@ void tst_QComboBox::getSetCheck() // void QComboBox::setItemDelegate(QAbstractItemDelegate *) MyAbstractItemDelegate *var10 = new MyAbstractItemDelegate; obj1.setItemDelegate(var10); - QCOMPARE(obj1.itemDelegate(), nullptr); + QCOMPARE(obj1.itemDelegate(), var10); QTest::ignoreMessage(QtWarningMsg, "QComboBox::setItemDelegate: cannot set a 0 delegate"); obj1.setItemDelegate((QAbstractItemDelegate *)0); - QCOMPARE(obj1.itemDelegate(), nullptr); + QCOMPARE(obj1.itemDelegate(), var10); // delete var10; // No delete, since QComboBox takes ownership // QAbstractItemModel * QComboBox::model() |