diff options
author | Eike Ziller <eike.ziller@nokia.com> | 2011-07-15 14:29:07 +0200 |
---|---|---|
committer | Eike Ziller <eike.ziller@nokia.com> | 2011-07-15 14:29:07 +0200 |
commit | e5ca4b346282d17e4c30e4ac41c46dc94fd53d76 (patch) | |
tree | b2a4868eb1f45bc4b5a728ec15782d14e9b86457 /src/plugins/valgrind/memcheckerrorview.cpp | |
parent | ab8713d7921ba915efb4e2f1f40ad0b3ce1a12f2 (diff) | |
parent | dbc0fa091926926ff6e26d3fcae74a596512798b (diff) |
Merge remote-tracking branch 'origin/2.3'
Conflicts:
qtcreator.pri
share/qtcreator/dumper/dumper.py
share/qtcreator/qml/qmlpuppet/instances/objectnodeinstance.h
src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp
src/plugins/valgrind/valgrind.pro
tests/manual/gdbdebugger/simple/simple_gdbtest_app.cpp
Change-Id: Ic2d347012d89d697e6382f156e64f9619da88300
Diffstat (limited to 'src/plugins/valgrind/memcheckerrorview.cpp')
-rw-r--r-- | src/plugins/valgrind/memcheckerrorview.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/plugins/valgrind/memcheckerrorview.cpp b/src/plugins/valgrind/memcheckerrorview.cpp index f044a7850b0..31fcd884fa2 100644 --- a/src/plugins/valgrind/memcheckerrorview.cpp +++ b/src/plugins/valgrind/memcheckerrorview.cpp @@ -509,11 +509,13 @@ void MemcheckErrorView::suppressError() void MemcheckErrorView::goNext() { + QTC_ASSERT(rowCount(), return); setCurrentRow((currentRow() + 1) % rowCount()); } void MemcheckErrorView::goBack() { + QTC_ASSERT(rowCount(), return); const int prevRow = currentRow() - 1; setCurrentRow(prevRow >= 0 ? prevRow : rowCount() - 1); } |