diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-11-09 10:46:57 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-11-09 10:46:57 (GMT) |
| commit | 683cca297d29e7ea9f84c087a3c081dcccea48fb (patch) | |
| tree | 88ca39218e1fedf94751b927d7e04944a4c66e16 /src/gui/itemviews/qtreeview_p.h | |
| parent | 338fe3c15e90d62606806b0845bb621dd05153ae (diff) | |
| parent | fa7f6e542b8381dd3af525507cd6e0a3ee43b813 (diff) | |
| download | Qt-683cca297d29e7ea9f84c087a3c081dcccea48fb.zip Qt-683cca297d29e7ea9f84c087a3c081dcccea48fb.tar.gz Qt-683cca297d29e7ea9f84c087a3c081dcccea48fb.tar.bz2 | |
Merge branch '4.6' of git@scm.dev.nokia.troll.no:qt/qt into 4.6
Conflicts:
src/gui/kernel/qwidget_win.cpp
Diffstat (limited to 'src/gui/itemviews/qtreeview_p.h')
| -rw-r--r-- | src/gui/itemviews/qtreeview_p.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/itemviews/qtreeview_p.h b/src/gui/itemviews/qtreeview_p.h index aad5837..d58dea3 100644 --- a/src/gui/itemviews/qtreeview_p.h +++ b/src/gui/itemviews/qtreeview_p.h @@ -105,7 +105,7 @@ public: int top() const { return startValue().toInt(); } QRect rect() const { QRect rect = viewport->rect(); rect.moveTop(top()); return rect; } void updateCurrentValue(const QVariant &) { viewport->update(rect()); } - void updateState(State, State state) { if (state == Stopped) before = after = QPixmap(); } + void updateState(State state, State) { if (state == Stopped) before = after = QPixmap(); } } animatedOperation; void prepareAnimatedOperation(int item, QVariantAnimation::Direction d); void beginAnimatedOperation(); |