diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-03 14:20:01 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-04 11:12:05 +0100 |
commit | ca2f44680cb97e7a7c46ee0ab26654822fe65e2d (patch) | |
tree | b9d85ad8ec1b18a6aa56b7657812cf3791bdf72e /src/widgets/itemviews/qtreeview.cpp | |
parent | 28a21d98ef8d880a6dd86ee19dd803424bb5eae1 (diff) | |
parent | 83188c6499ccdc87c0a2c468bb497e287f5db369 (diff) |
Merge branch 'stable' into dev
Conflicts:
examples/widgets/painting/shared/shared.pri
src/corelib/tools/qharfbuzz_p.h
src/corelib/tools/qunicodetools.cpp
src/plugins/platforms/windows/accessible/qwindowsaccessibility.cpp
src/plugins/platforms/windows/qwindowsfontdatabase.cpp
Change-Id: Ibc9860abf570e5ce8b052fb88feb73ec35e64bd3
Diffstat (limited to 'src/widgets/itemviews/qtreeview.cpp')
-rw-r--r-- | src/widgets/itemviews/qtreeview.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/widgets/itemviews/qtreeview.cpp b/src/widgets/itemviews/qtreeview.cpp index fe34d3de6a..194fb71880 100644 --- a/src/widgets/itemviews/qtreeview.cpp +++ b/src/widgets/itemviews/qtreeview.cpp @@ -146,10 +146,10 @@ QT_BEGIN_NAMESPACE \endomit \table 100% - \row \li \inlineimage windowsxp-treeview.png Screenshot of a Windows XP style tree view + \row \li \inlineimage windowsvista-treeview.png Screenshot of a Windows Vista style tree view \li \inlineimage macintosh-treeview.png Screenshot of a Macintosh style tree view \li \inlineimage fusion-treeview.png Screenshot of a Fusion style tree view - \row \li A \l{Windows XP Style Widget Gallery}{Windows XP style} tree view. + \row \li A \l{Windows Vista Style Widget Gallery}{Windows Vista style} tree view. \li A \l{Macintosh Style Widget Gallery}{Macintosh style} tree view. \li A \l{Fusion Style Widget Gallery}{Fusion style} tree view. \endtable @@ -876,7 +876,7 @@ bool QTreeView::isSortingEnabled() const \brief whether animations are enabled If this property is true the treeview will animate expandsion - and collasping of branches. If this property is false, the treeview + and collapsing of branches. If this property is false, the treeview will expand or collapse branches immediately without showing the animation. @@ -3743,7 +3743,7 @@ void QTreeView::currentChanged(const QModelIndex ¤t, const QModelIndex &pr } #ifndef QT_NO_ACCESSIBILITY if (QAccessible::isActive() && current.isValid()) { - int entry = (visualIndex(current) + (header()?1:0))*current.model()->columnCount()+current.column() + 1; + int entry = (visualIndex(current) + (header()?1:0))*current.model()->columnCount()+current.column(); QAccessibleEvent event(this, QAccessible::Focus); event.setChild(entry); QAccessible::updateAccessibility(&event); @@ -3763,16 +3763,16 @@ void QTreeView::selectionChanged(const QItemSelection &selected, // ### does not work properly for selection ranges. QModelIndex sel = selected.indexes().value(0); if (sel.isValid()) { - int entry = (visualIndex(sel) + (header()?1:0))*sel.model()->columnCount()+sel.column() + 1; - Q_ASSERT(entry > 0); + int entry = (visualIndex(sel) + (header()?1:0))*sel.model()->columnCount()+sel.column(); + Q_ASSERT(entry >= 0); QAccessibleEvent event(this, QAccessible::Selection); event.setChild(entry); QAccessible::updateAccessibility(&event); } QModelIndex desel = deselected.indexes().value(0); if (desel.isValid()) { - int entry = (visualIndex(desel) + (header()?1:0))*desel.model()->columnCount()+desel.column() + 1; - Q_ASSERT(entry > 0); + int entry = (visualIndex(desel) + (header()?1:0))*desel.model()->columnCount()+desel.column(); + Q_ASSERT(entry >= 0); QAccessibleEvent event(this, QAccessible::SelectionRemove); event.setChild(entry); QAccessible::updateAccessibility(&event); |