diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-04-14 00:16:41 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-04-14 00:16:41 (GMT) |
| commit | 3469fe05e4b04567598202fecc16c1decfb3ab63 (patch) | |
| tree | 3e7c3237d935a9942de937fafd186be17db7e547 /src/declarative/graphicsitems | |
| parent | 532c21c7fc0a4075fe691507ec17b3dea7e3c043 (diff) | |
| download | Qt-3469fe05e4b04567598202fecc16c1decfb3ab63.zip Qt-3469fe05e4b04567598202fecc16c1decfb3ab63.tar.gz Qt-3469fe05e4b04567598202fecc16c1decfb3ab63.tar.bz2 | |
Don't crash when columns == 0
Task-number: QTBUG-9805
Diffstat (limited to 'src/declarative/graphicsitems')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativepositioners.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativepositioners.cpp b/src/declarative/graphicsitems/qdeclarativepositioners.cpp index d33a8be..f436471 100644 --- a/src/declarative/graphicsitems/qdeclarativepositioners.cpp +++ b/src/declarative/graphicsitems/qdeclarativepositioners.cpp @@ -700,14 +700,15 @@ void QDeclarativeGrid::setRows(const int rows) void QDeclarativeGrid::doPositioning(QSizeF *contentSize) { - int c=_columns,r=_rows;//Actual number of rows/columns + int c = _columns; + int r = _rows; int numVisible = positionedItems.count(); - if (_columns==-1 && _rows==-1){ + if (_columns <= 0 && _rows <= 0){ c = 4; r = (numVisible+3)/4; - }else if (_rows==-1){ + } else if (_rows <= 0){ r = (numVisible+(_columns-1))/_columns; - }else if (_columns==-1){ + } else if (_columns <= 0){ c = (numVisible+(_rows-1))/_rows; } |