diff options
| author | Emmanuel Pescosta <[email protected]> | 2016-04-09 14:19:33 +0200 |
|---|---|---|
| committer | Emmanuel Pescosta <[email protected]> | 2016-04-09 14:19:33 +0200 |
| commit | e9a254b46ab1be5860164535396e601f976761b4 (patch) | |
| tree | 6156a444c8b42a27aabe800ca4ef9f79361b7f48 | |
| parent | 0c904334781084533e699b95f9c2dde3a9833fcf (diff) | |
| parent | 5d6b5d882f5d2c8c26d30ac513ec6c35764c0e9d (diff) | |
Merge branch 'Applications/16.04'
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | src/kitemviews/kitemlistviewaccessible.cpp | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 325b2806a..330cb1f0f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,8 +4,8 @@ project(Dolphin) # KDE Application Version, managed by release script set (KDE_APPLICATIONS_VERSION_MAJOR "16") -set (KDE_APPLICATIONS_VERSION_MINOR "07") -set (KDE_APPLICATIONS_VERSION_MICRO "70") +set (KDE_APPLICATIONS_VERSION_MINOR "03") +set (KDE_APPLICATIONS_VERSION_MICRO "90") set (KDE_APPLICATIONS_VERSION "${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO}") set(QT_MIN_VERSION "5.4.0") diff --git a/src/kitemviews/kitemlistviewaccessible.cpp b/src/kitemviews/kitemlistviewaccessible.cpp index f8630218f..6f06e243e 100644 --- a/src/kitemviews/kitemlistviewaccessible.cpp +++ b/src/kitemviews/kitemlistviewaccessible.cpp @@ -73,8 +73,10 @@ QAccessibleInterface* KItemListViewAccessible::cell(int index) const return 0; } - if (m_cells.size() < index - 1) + if (m_cells.size() <= index) { m_cells.resize(childCount()); + } + Q_ASSERT(index < m_cells.size()); QAccessibleInterface* child = m_cells.at(index); if (!child) { |