Merge remote-tracking branch 'origin/5.5' into 5.6

Conflicts:
	qmake/doc/src/qmake-manual.qdoc
	src/corelib/tools/qstring.h
	src/gui/image/qimagereader.cpp
	src/network/access/qnetworkaccessmanager.cpp
	src/tools/qdoc/doc/examples/examples.qdoc
	src/widgets/accessible/qaccessiblewidgetfactory_p.h
	src/widgets/doc/qtwidgets.qdocconf

Change-Id: I8fae62283aebefe24e5ca4b4abd97386560c0fcb

1 files changed, 295 insertions, 0 deletions

diff --git a/src/widgets/accessible/itemviews_p.h b/src/widgets/accessible/itemviews_p.h
new file mode 100644
index 0000000000..6a18a1231b
--- /dev/null
+++ b/src/widgets/accessible/itemviews_p.h
@@ -0,0 +1,295 @@
+/****************************************************************************
+**
+** Copyright (C) 2015 The Qt Company Ltd.
+** Contact: http://www.qt.io/licensing/
+**
+** This file is part of the plugins of the Qt Toolkit.
+**
+** $QT_BEGIN_LICENSE:LGPL21$
+** Commercial License Usage
+** Licensees holding valid commercial Qt licenses may use this file in
+** accordance with the commercial license agreement provided with the
+** Software or, alternatively, in accordance with the terms contained in
+** a written agreement between you and The Qt Company. For licensing terms
+** and conditions see http://www.qt.io/terms-conditions. For further
+** information use the contact form at http://www.qt.io/contact-us.
+**
+** GNU Lesser General Public License Usage
+** Alternatively, this file may be used under the terms of the GNU Lesser
+** General Public License version 2.1 or version 3 as published by the Free
+** Software Foundation and appearing in the file LICENSE.LGPLv21 and
+** LICENSE.LGPLv3 included in the packaging of this file. Please review the
+** following information to ensure the GNU Lesser General Public License
+** requirements will be met: https://www.gnu.org/licenses/lgpl.html and
+** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html.
+**
+** As a special exception, The Qt Company gives you certain additional
+** rights. These rights are described in The Qt Company LGPL Exception
+** version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+**
+** $QT_END_LICENSE$
+**
+****************************************************************************/
+
+#ifndef ACCESSIBLE_ITEMVIEWS_H
+#define ACCESSIBLE_ITEMVIEWS_H
+
+//
+//  W A R N I N G
+//  -------------
+//
+// This file is not part of the Qt API.  It exists purely as an
+// implementation detail.  This header file may change from version to
+// version without notice, or even be removed.
+//
+// We mean it.
+//
+
+#include "QtCore/qpointer.h"
+#include <QtGui/qaccessible.h>
+#include <QtWidgets/qaccessiblewidget.h>
+#include <QtWidgets/qabstractitemview.h>
+#include <QtWidgets/qheaderview.h>
+
+
+QT_BEGIN_NAMESPACE
+
+#ifndef QT_NO_ACCESSIBILITY
+
+#ifndef QT_NO_ITEMVIEWS
+
+class QAccessibleTableCell;
+class QAccessibleTableHeaderCell;
+
+class QAccessibleTable :public QAccessibleTableInterface, public QAccessibleObject
+{
+public:
+    explicit QAccessibleTable(QWidget *w);
+    bool isValid() const Q_DECL_OVERRIDE;
+
+    QAccessible::Role role() const Q_DECL_OVERRIDE;
+    QAccessible::State state() const Q_DECL_OVERRIDE;
+    QString text(QAccessible::Text t) const Q_DECL_OVERRIDE;
+    QRect rect() const Q_DECL_OVERRIDE;
+
+    QAccessibleInterface *childAt(int x, int y) const Q_DECL_OVERRIDE;
+    int childCount() const Q_DECL_OVERRIDE;
+    int indexOfChild(const QAccessibleInterface *) const Q_DECL_OVERRIDE;
+
+    QAccessibleInterface *parent() const Q_DECL_OVERRIDE;
+    QAccessibleInterface *child(int index) const Q_DECL_OVERRIDE;
+
+    void *interface_cast(QAccessible::InterfaceType t) Q_DECL_OVERRIDE;
+
+    // table interface
+    virtual QAccessibleInterface *cellAt(int row, int column) const Q_DECL_OVERRIDE;
+    virtual QAccessibleInterface *caption() const Q_DECL_OVERRIDE;
+    virtual QAccessibleInterface *summary() const Q_DECL_OVERRIDE;
+    virtual QString columnDescription(int column) const Q_DECL_OVERRIDE;
+    virtual QString rowDescription(int row) const Q_DECL_OVERRIDE;
+    virtual int columnCount() const Q_DECL_OVERRIDE;
+    virtual int rowCount() const Q_DECL_OVERRIDE;
+
+    // selection
+    virtual int selectedCellCount() const Q_DECL_OVERRIDE;
+    virtual int selectedColumnCount() const Q_DECL_OVERRIDE;
+    virtual int selectedRowCount() const Q_DECL_OVERRIDE;
+    virtual QList<QAccessibleInterface*> selectedCells() const Q_DECL_OVERRIDE;
+    virtual QList<int> selectedColumns() const Q_DECL_OVERRIDE;
+    virtual QList<int> selectedRows() const Q_DECL_OVERRIDE;
+    virtual bool isColumnSelected(int column) const Q_DECL_OVERRIDE;
+    virtual bool isRowSelected(int row) const Q_DECL_OVERRIDE;
+    virtual bool selectRow(int row) Q_DECL_OVERRIDE;
+    virtual bool selectColumn(int column) Q_DECL_OVERRIDE;
+    virtual bool unselectRow(int row) Q_DECL_OVERRIDE;
+    virtual bool unselectColumn(int column) Q_DECL_OVERRIDE;
+
+    QAbstractItemView *view() const;
+
+    void modelChange(QAccessibleTableModelChangeEvent *event) Q_DECL_OVERRIDE;
+
+protected:
+    inline QAccessible::Role cellRole() const {
+        switch (m_role) {
+        case QAccessible::List:
+            return QAccessible::ListItem;
+        case QAccessible::Table:
+            return QAccessible::Cell;
+        case QAccessible::Tree:
+            return QAccessible::TreeItem;
+        default:
+            Q_ASSERT(0);
+        }
+        return QAccessible::NoRole;
+    }
+
+    QHeaderView *horizontalHeader() const;
+    QHeaderView *verticalHeader() const;
+
+    // maybe vector
+    typedef QHash<int, QAccessible::Id> ChildCache;
+    mutable ChildCache childToId;
+
+    virtual ~QAccessibleTable();
+
+private:
+    // the child index for a model index
+    inline int logicalIndex(const QModelIndex &index) const;
+    QAccessible::Role m_role;
+};
+
+class QAccessibleTree :public QAccessibleTable
+{
+public:
+    explicit QAccessibleTree(QWidget *w)
+        : QAccessibleTable(w)
+    {}
+
+
+    QAccessibleInterface *childAt(int x, int y) const Q_DECL_OVERRIDE;
+    int childCount() const Q_DECL_OVERRIDE;
+    QAccessibleInterface *child(int index) const Q_DECL_OVERRIDE;
+
+    int indexOfChild(const QAccessibleInterface *) const Q_DECL_OVERRIDE;
+
+    int rowCount() const Q_DECL_OVERRIDE;
+
+    // table interface
+    QAccessibleInterface *cellAt(int row, int column) const Q_DECL_OVERRIDE;
+    QString rowDescription(int row) const Q_DECL_OVERRIDE;
+    bool isRowSelected(int row) const Q_DECL_OVERRIDE;
+    bool selectRow(int row) Q_DECL_OVERRIDE;
+
+private:
+    QModelIndex indexFromLogical(int row, int column = 0) const;
+
+    inline int logicalIndex(const QModelIndex &index) const;
+};
+
+class QAccessibleTableCell: public QAccessibleInterface, public QAccessibleTableCellInterface, public QAccessibleActionInterface
+{
+public:
+    QAccessibleTableCell(QAbstractItemView *view, const QModelIndex &m_index, QAccessible::Role role);
+
+    void *interface_cast(QAccessible::InterfaceType t) Q_DECL_OVERRIDE;
+    QObject *object() const Q_DECL_OVERRIDE { return Q_NULLPTR; }
+    QAccessible::Role role() const Q_DECL_OVERRIDE;
+    QAccessible::State state() const Q_DECL_OVERRIDE;
+    QRect rect() const Q_DECL_OVERRIDE;
+    bool isValid() const Q_DECL_OVERRIDE;
+
+    QAccessibleInterface *childAt(int, int) const Q_DECL_OVERRIDE { return Q_NULLPTR; }
+    int childCount() const Q_DECL_OVERRIDE { return 0; }
+    int indexOfChild(const QAccessibleInterface *) const Q_DECL_OVERRIDE { return -1; }
+
+    QString text(QAccessible::Text t) const Q_DECL_OVERRIDE;
+    void setText(QAccessible::Text t, const QString &text) Q_DECL_OVERRIDE;
+
+    QAccessibleInterface *parent() const Q_DECL_OVERRIDE;
+    QAccessibleInterface *child(int) const Q_DECL_OVERRIDE;
+
+    // cell interface
+    virtual int columnExtent() const Q_DECL_OVERRIDE;
+    virtual QList<QAccessibleInterface*> columnHeaderCells() const Q_DECL_OVERRIDE;
+    virtual int columnIndex() const Q_DECL_OVERRIDE;
+    virtual int rowExtent() const Q_DECL_OVERRIDE;
+    virtual QList<QAccessibleInterface*> rowHeaderCells() const Q_DECL_OVERRIDE;
+    virtual int rowIndex() const Q_DECL_OVERRIDE;
+    virtual bool isSelected() const Q_DECL_OVERRIDE;
+    virtual QAccessibleInterface* table() const Q_DECL_OVERRIDE;
+
+    //action interface
+    virtual QStringList actionNames() const Q_DECL_OVERRIDE;
+    virtual void doAction(const QString &actionName) Q_DECL_OVERRIDE;
+    virtual QStringList keyBindingsForAction(const QString &actionName) const Q_DECL_OVERRIDE;
+
+private:
+    QHeaderView *verticalHeader() const;
+    QHeaderView *horizontalHeader() const;
+    QPointer<QAbstractItemView > view;
+    QModelIndex m_index;
+    QAccessible::Role m_role;
+
+    void selectCell();
+    void unselectCell();
+
+friend class QAccessibleTable;
+friend class QAccessibleTree;
+};
+
+
+class QAccessibleTableHeaderCell: public QAccessibleInterface
+{
+public:
+    // For header cells, pass the header view in addition
+    QAccessibleTableHeaderCell(QAbstractItemView *view, int index, Qt::Orientation orientation);
+
+    QObject *object() const Q_DECL_OVERRIDE { return Q_NULLPTR; }
+    QAccessible::Role role() const Q_DECL_OVERRIDE;
+    QAccessible::State state() const Q_DECL_OVERRIDE;
+    QRect rect() const Q_DECL_OVERRIDE;
+    bool isValid() const Q_DECL_OVERRIDE;
+
+    QAccessibleInterface *childAt(int, int) const Q_DECL_OVERRIDE { return Q_NULLPTR; }
+    int childCount() const Q_DECL_OVERRIDE { return 0; }
+    int indexOfChild(const QAccessibleInterface *) const Q_DECL_OVERRIDE { return -1; }
+
+    QString text(QAccessible::Text t) const Q_DECL_OVERRIDE;
+    void setText(QAccessible::Text t, const QString &text) Q_DECL_OVERRIDE;
+
+    QAccessibleInterface *parent() const Q_DECL_OVERRIDE;
+    QAccessibleInterface *child(int index) const Q_DECL_OVERRIDE;
+
+private:
+    QHeaderView *headerView() const;
+
+    QPointer<QAbstractItemView> view;
+    int index;
+    Qt::Orientation orientation;
+
+friend class QAccessibleTable;
+friend class QAccessibleTree;
+};
+
+// This is the corner button on the top left of a table.
+// It can be used to select all cells or it is not active at all.
+// For now it is ignored.
+class QAccessibleTableCornerButton: public QAccessibleInterface
+{
+public:
+    QAccessibleTableCornerButton(QAbstractItemView *view_)
+        :view(view_)
+    {}
+
+    QObject *object() const Q_DECL_OVERRIDE { return Q_NULLPTR; }
+    QAccessible::Role role() const Q_DECL_OVERRIDE { return QAccessible::Pane; }
+    QAccessible::State state() const Q_DECL_OVERRIDE { return QAccessible::State(); }
+    QRect rect() const Q_DECL_OVERRIDE { return QRect(); }
+    bool isValid() const Q_DECL_OVERRIDE { return true; }
+
+    QAccessibleInterface *childAt(int, int) const Q_DECL_OVERRIDE { return Q_NULLPTR; }
+    int childCount() const Q_DECL_OVERRIDE { return 0; }
+    int indexOfChild(const QAccessibleInterface *) const Q_DECL_OVERRIDE { return -1; }
+
+    QString text(QAccessible::Text) const Q_DECL_OVERRIDE { return QString(); }
+    void setText(QAccessible::Text, const QString &) Q_DECL_OVERRIDE {}
+
+    QAccessibleInterface *parent() const Q_DECL_OVERRIDE {
+        return QAccessible::queryAccessibleInterface(view);
+    }
+    QAccessibleInterface *child(int) const Q_DECL_OVERRIDE {
+        return Q_NULLPTR;
+    }
+
+private:
+    QPointer<QAbstractItemView> view;
+};
+
+
+#endif
+
+#endif // QT_NO_ACCESSIBILITY
+
+QT_END_NAMESPACE
+
+#endif // ACCESSIBLE_ITEMVIEWS_H