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

Conflicts:
	src/corelib/io/qprocess.cpp
	src/corelib/io/qprocess_unix.cpp
	src/network/kernel/qnetworkinterface_winrt.cpp
	tools/configure/configureapp.cpp

Change-Id: I47df00a01597d2e63b334b492b3b4221b29f58ea

2 files changed, 14 insertions, 2 deletions

diff --git a/src/widgets/styles/qstyle.cpp b/src/widgets/styles/qstyle.cpp
index 5f9f0b8e75..9bca11b992 100644
--- a/src/widgets/styles/qstyle.cpp
+++ b/src/widgets/styles/qstyle.cpp
@@ -898,7 +898,7 @@ void QStyle::drawItemPixmap(QPainter *painter, const QRect &rect, int alignment,
     \value CE_ToolBoxTabLabel  The toolbox's tab label.
     \value CE_HeaderEmptyArea  The area of a header view where there are no header sections.
 
-    \value CE_ShapedFrame The frame with the shape specified in the QStyleOptionFrameV3; see QFrame.
+    \value CE_ShapedFrame The frame with the shape specified in the QStyleOptionFrame; see QFrame.
 
     \omitvalue CE_ColumnViewGrip
 
@@ -1036,7 +1036,7 @@ void QStyle::drawItemPixmap(QPainter *painter, const QRect &rect, int alignment,
     \omitvalue SE_ViewItemCheckIndicator
 
     \value SE_FrameContents  Area for a frame's contents.
-    \value SE_ShapedFrameContents Area for a frame's contents using the shape in QStyleOptionFrameV3; see QFrame
+    \value SE_ShapedFrameContents Area for a frame's contents using the shape in QStyleOptionFrame; see QFrame
     \value SE_FrameLayoutItem  Area that counts for the parent layout.
 
     \value SE_HeaderArrow Area for the sort indicator for a header.
diff --git a/src/widgets/styles/qstyleoption.cpp b/src/widgets/styles/qstyleoption.cpp
index cab56e329e..d66dbec472 100644
--- a/src/widgets/styles/qstyleoption.cpp
+++ b/src/widgets/styles/qstyleoption.cpp
@@ -475,6 +475,7 @@ QStyleOptionFocusRect::QStyleOptionFocusRect(int version)
 /*!
     \typedef QStyleOptionFrameV2
     \relates QStyleOptionFrame
+    \obsolete
 
     Synonym for QStyleOptionFrame.
 */
@@ -482,6 +483,7 @@ QStyleOptionFocusRect::QStyleOptionFocusRect(int version)
 /*!
     \typedef QStyleOptionFrameV3
     \relates QStyleOptionFrame
+    \obsolete
 
     Synonym for QStyleOptionFrame.
 */
@@ -1253,6 +1255,7 @@ QStyleOptionToolBar::QStyleOptionToolBar(int version)
 /*!
     \typedef QStyleOptionTabV2
     \relates QStyleOptionTab
+    \obsolete
 
     Synonym for QStyleOptionTab.
 */
@@ -1260,6 +1263,7 @@ QStyleOptionToolBar::QStyleOptionToolBar(int version)
 /*!
     \typedef QStyleOptionTabV3
     \relates QStyleOptionTab
+    \obsolete
 
     Synonym for QStyleOptionTab.
 */
@@ -1497,6 +1501,7 @@ QStyleOptionTab::QStyleOptionTab(int version)
 /*!
     \typedef QStyleOptionProgressBarV2
     \relates QStyleOptionProgressBar
+    \obsolete
 
     Synonym for QStyleOptionProgressBar.
 */
@@ -2270,6 +2275,7 @@ QStyleOptionSpinBox::QStyleOptionSpinBox(int version)
 /*!
     \typedef QStyleOptionDockWidgetV2
     \relates QStyleOptionDockWidget
+    \obsolete
 
     Synonym for QStyleOptionDockWidget.
 */
@@ -2675,6 +2681,7 @@ QStyleOptionComboBox::QStyleOptionComboBox(int version)
 /*!
     \typedef QStyleOptionToolBoxV2
     \relates QStyleOptionToolBox
+    \obsolete
 
     Synonym for QStyleOptionToolBox.
 */
@@ -3012,6 +3019,7 @@ QStyleOptionTitleBar::QStyleOptionTitleBar(int version)
 /*!
     \typedef QStyleOptionViewItemV2
     \relates QStyleOptionViewItem
+    \obsolete
 
     Synonym for QStyleOptionViewItem.
 */
@@ -3019,6 +3027,7 @@ QStyleOptionTitleBar::QStyleOptionTitleBar(int version)
 /*!
     \typedef QStyleOptionViewItemV3
     \relates QStyleOptionViewItem
+    \obsolete
 
     Synonym for QStyleOptionViewItem.
 */
@@ -3026,6 +3035,7 @@ QStyleOptionTitleBar::QStyleOptionTitleBar(int version)
 /*!
     \typedef QStyleOptionViewItemV4
     \relates QStyleOptionViewItem
+    \obsolete
 
     Synonym for QStyleOptionViewItem.
 */
@@ -3298,6 +3308,7 @@ QStyleOptionViewItem::QStyleOptionViewItem(int version)
 /*!
     \typedef QStyleOptionTabWidgetFrameV2
     \relates QStyleOptionTabWidgetFrame
+    \obsolete
 
     Synonym for QStyleOptionTabWidgetFrame.
 */
@@ -3447,6 +3458,7 @@ QStyleOptionTabWidgetFrame::QStyleOptionTabWidgetFrame(int version)
 /*!
     \typedef QStyleOptionTabBarBaseV2
     \relates QStyleOptionTabBarBase
+    \obsolete
 
     Synonym for QStyleOptionTabBarBase.
 */