diff options
| author | Tobias Koenig <tokoe@kde.org> | 2009-06-16 16:07:42 (GMT) |
|---|---|---|
| committer | Tobias Koenig <tokoe@kde.org> | 2009-06-16 16:07:42 (GMT) |
| commit | 65c2d095cddfda32052925654dd1defd314ad4b3 (patch) | |
| tree | 222ac5b04cd1c7a273b0c22d01d0ff3682d5d2d3 /tests/auto/qcombobox/tst_qcombobox.cpp | |
| parent | f1e6e89f7ee452af0e4404af537f5fed2a2b2dc5 (diff) | |
| parent | d9308550f104526d29b1cdd56514ae3bb967d7f9 (diff) | |
| download | Qt-65c2d095cddfda32052925654dd1defd314ad4b3.zip Qt-65c2d095cddfda32052925654dd1defd314ad4b3.tar.gz Qt-65c2d095cddfda32052925654dd1defd314ad4b3.tar.bz2 | |
Merge branch 'master' of git://gitorious.org/qt/qt
Diffstat (limited to 'tests/auto/qcombobox/tst_qcombobox.cpp')
| -rw-r--r-- | tests/auto/qcombobox/tst_qcombobox.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/auto/qcombobox/tst_qcombobox.cpp b/tests/auto/qcombobox/tst_qcombobox.cpp index 816b2e8..5321348 100644 --- a/tests/auto/qcombobox/tst_qcombobox.cpp +++ b/tests/auto/qcombobox/tst_qcombobox.cpp @@ -2197,8 +2197,8 @@ void tst_QComboBox::noScrollbar() { QTableWidget *table = new QTableWidget(2,2); QComboBox comboBox; - comboBox.setView(table); comboBox.setModel(table->model()); + comboBox.setView(table); comboBox.show(); QTest::qWait(100); comboBox.resize(200, comboBox.height()); |