Merge remote-tracking branch 'origin/stable' into dev

For the conflicts in msvc_nmake.cpp the ifdefs are extended since we
need to support windows phone in the target branch while it is not there
in the current stable branch (as of Qt 5.2).

Conflicts:
	configure
	qmake/generators/win32/msvc_nmake.cpp
	src/3rdparty/angle/src/libEGL/Surface.cpp
	src/angle/src/common/common.pri
	src/corelib/global/qglobal.h
	src/corelib/io/qstandardpaths.cpp
	src/plugins/platforms/qnx/qqnxintegration.cpp
	src/plugins/platforms/qnx/qqnxscreeneventhandler.h
	src/plugins/platforms/xcb/qglxintegration.h
	src/widgets/kernel/win.pri
	tests/auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp
	tests/auto/corelib/tools/qdatetime/tst_qdatetime.cpp
	tests/auto/gui/text/qtextdocument/tst_qtextdocument.cpp
	tools/configure/configureapp.cpp

Change-Id: I00b579eefebaf61d26ab9b00046d2b5bd5958812

2 files changed, 0 insertions, 38 deletions

diff --git a/src/plugins/accessible/widgets/complexwidgets.cpp b/src/plugins/accessible/widgets/complexwidgets.cpp
index c0d62ccc16..b1df6d816a 100644
--- a/src/plugins/accessible/widgets/complexwidgets.cpp
+++ b/src/plugins/accessible/widgets/complexwidgets.cpp
@@ -221,41 +221,6 @@ QString QAccessibleTabBar::text(QAccessible::Text t) const
     return QString();
 }
 
-/*!
-    Selects the item with index \a child if \a on is true; otherwise
-    unselects it. If \a extend is true and the selection mode is not
-    \c Single and there is an existing selection, the selection is
-    extended to include all the items from the existing selection up
-    to and including the item with index \a child. Returns \c true if a
-    selection was made or extended; otherwise returns \c false.
-
-    \sa selection(), clearSelection()
-*/
-bool QAccessibleTabBar::setSelected(int child, bool on, bool extend)
-{
-    if (!child || !on || extend || child > tabBar()->count())
-        return false;
-
-    if (!tabBar()->isTabEnabled(child - 1))
-        return false;
-    tabBar()->setCurrentIndex(child - 1);
-    return true;
-}
-
-/*!
-    Returns a (possibly empty) list of indexes of the items selected
-    in the list box.
-
-    \sa setSelected(), clearSelection()
-*/
-QVector<int> QAccessibleTabBar::selection() const
-{
-    QVector<int> array;
-    if (tabBar()->currentIndex() != -1)
-        array +=tabBar()->currentIndex() + 1;
-    return array;
-}
-
 #endif // QT_NO_TABBAR
 
 #ifndef QT_NO_COMBOBOX
diff --git a/src/plugins/accessible/widgets/complexwidgets.h b/src/plugins/accessible/widgets/complexwidgets.h
index 164bc5b6d9..00186282f3 100644
--- a/src/plugins/accessible/widgets/complexwidgets.h
+++ b/src/plugins/accessible/widgets/complexwidgets.h
@@ -105,9 +105,6 @@ public:
     int childCount() const Q_DECL_OVERRIDE;
     QString text(QAccessible::Text t) const Q_DECL_OVERRIDE;
 
-    bool setSelected(int child, bool on, bool extend);
-    QVector<int> selection() const;
-
     QAccessibleInterface* child(int index) const Q_DECL_OVERRIDE;
     int indexOfChild(const QAccessibleInterface *child) const Q_DECL_OVERRIDE;