diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2009-04-20 07:23:43 (GMT) |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2009-04-20 07:23:43 (GMT) |
| commit | 67926b8e4d9e7463597ef113944d78ca326fd9ae (patch) | |
| tree | e24fa54e245a8c3b27cd1f740aaf5d296e05621b /src/gui/itemviews/qheaderview_p.h | |
| parent | 2c762f3b8b284a7c6dc0c499b7052013bad5b707 (diff) | |
| parent | 10194aafd10824fe1919aa44083224e8bea442ca (diff) | |
| download | Qt-67926b8e4d9e7463597ef113944d78ca326fd9ae.zip Qt-67926b8e4d9e7463597ef113944d78ca326fd9ae.tar.gz Qt-67926b8e4d9e7463597ef113944d78ca326fd9ae.tar.bz2 | |
Merge branch '4.5' of git@scm.dev.nokia.troll.no:qt/qt
Conflicts:
src/gui/itemviews/qheaderview_p.h
Diffstat (limited to 'src/gui/itemviews/qheaderview_p.h')
| -rw-r--r-- | src/gui/itemviews/qheaderview_p.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gui/itemviews/qheaderview_p.h b/src/gui/itemviews/qheaderview_p.h index 95bd84c..cfb1c3e 100644 --- a/src/gui/itemviews/qheaderview_p.h +++ b/src/gui/itemviews/qheaderview_p.h @@ -90,7 +90,6 @@ public: highlightSelected(false), stretchLastSection(false), cascadingResizing(false), - forceInitializing(false), resizeRecursionBlock(false), stretchSections(0), contentsSections(0), @@ -271,7 +270,6 @@ public: bool highlightSelected; bool stretchLastSection; bool cascadingResizing; - bool forceInitializing; bool resizeRecursionBlock; int stretchSections; int contentsSections; @@ -307,6 +305,7 @@ public: void createSectionSpan(int start, int end, int size, QHeaderView::ResizeMode mode); void removeSectionsFromSpans(int start, int end); void resizeSectionSpan(int visualIndex, int oldSize, int newSize); + void setDefaultSectionSize(int size); inline int headerSectionCount() const { // for debugging int count = 0; |