1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix compilation with -force-asserts.

Browse Source 
Change-Id: I2f697ba9ab9a5a8393e778abad4da18c7f232d7f
Reviewed-by: Harald Fernengel <harald.fernengel@nokia.com>
This commit is contained in:
Friedemann Kleint 2011-11-17 10:49:42 +01:00 committed by Qt by Nokia
parent 5d3385431d
commit 11e8138495
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/widgets/itemviews/qheaderview.cpp
View File

@ -3126,8 +3126,8 @@ void QHeaderViewPrivate::createSectionSpan(int start, int end, int size, QHeader
// the new span is in the middle of the old span, so we have to split it // the new span is in the middle of the old span, so we have to split it
length -= sectionSpans.at(i).size; length -= sectionSpans.at(i).size;
int section_size = sectionSpans.at(i).sectionSize(); int section_size = sectionSpans.at(i).sectionSize();
#ifndef QT_NO_DEBUG #if !defined(QT_NO_DEBUG) || defined(QT_FORCE_ASSERTS)
int span_count = sectionSpans.at(i).count; const int span_count = sectionSpans.at(i).count;
#endif #endif
QHeaderView::ResizeMode span_mode = sectionSpans.at(i).resizeMode; QHeaderView::ResizeMode span_mode = sectionSpans.at(i).resizeMode;
// first span // first span
@ -3139,7 +3139,7 @@ void QHeaderViewPrivate::createSectionSpan(int start, int end, int size, QHeader
length += first_span_size; length += first_span_size;
// middle span (the new span) // middle span (the new span)
#if !defined(QT_NO_DEBUG) || defined(QT_FORCE_ASSERTS) #if !defined(QT_NO_DEBUG) || defined(QT_FORCE_ASSERTS)
int mid_span_count = span.count; const int mid_span_count = span.count;
#endif #endif
int mid_span_size = span.size; int mid_span_size = span.size;
sectionSpans.insert(i + 1, span); sectionSpans.insert(i + 1, span);