diff options
| author | axis <qt-info@nokia.com> | 2009-12-16 09:37:34 +0100 |
|---|---|---|
| committer | axis <qt-info@nokia.com> | 2009-12-16 09:37:34 +0100 |
| commit | 6e527912d719b0448b91eba1d6a99b9cbe58170a (patch) | |
| tree | 17ba94b2af34ba2ab953fbd7be84955bdea39370 /src/gui/itemviews/qabstractitemview.cpp | |
| parent | 8152bd167c1a728c54a9976297bb53e09d131d66 (diff) | |
| parent | a9d4faa330698a7972c7fa4b3582fb20548b32f6 (diff) | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6-s60
Conflicts:
src/s60installs/bwins/QtGuiu.def
Diffstat (limited to 'src/gui/itemviews/qabstractitemview.cpp')
| -rw-r--r-- | src/gui/itemviews/qabstractitemview.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/itemviews/qabstractitemview.cpp b/src/gui/itemviews/qabstractitemview.cpp index d0aac2a66b..5ddba06627 100644 --- a/src/gui/itemviews/qabstractitemview.cpp +++ b/src/gui/itemviews/qabstractitemview.cpp @@ -2882,6 +2882,8 @@ int QAbstractItemView::sizeHintForRow(int row) const if (row < 0 || row >= d->model->rowCount() || !model()) return -1; + ensurePolished(); + QStyleOptionViewItemV4 option = d->viewOptionsV4(); int height = 0; int colCount = d->model->columnCount(d->root); @@ -2911,6 +2913,8 @@ int QAbstractItemView::sizeHintForColumn(int column) const if (column < 0 || column >= d->model->columnCount() || !model()) return -1; + ensurePolished(); + QStyleOptionViewItemV4 option = d->viewOptionsV4(); int width = 0; int rows = d->model->rowCount(d->root); |