2 files changed, 0 insertions, 122 deletions

diff --git a/src/widgets/styles/qstyleoption.cpp b/src/widgets/styles/qstyleoption.cpp
index 3194f5b941..1b2e0772c7 100644
--- a/src/widgets/styles/qstyleoption.cpp
+++ b/src/widgets/styles/qstyleoption.cpp
@@ -471,22 +471,6 @@ QStyleOptionFocusRect::QStyleOptionFocusRect(int version)
 */
 
 /*!
-    \typedef QStyleOptionFrameV2
-    \relates QStyleOptionFrame
-    \obsolete
-
-    Synonym for QStyleOptionFrame.
-*/
-
-/*!
-    \typedef QStyleOptionFrameV3
-    \relates QStyleOptionFrame
-    \obsolete
-
-    Synonym for QStyleOptionFrame.
-*/
-
-/*!
     Constructs a QStyleOptionFrame, initializing the members
     variables to their default values.
 */
@@ -1251,30 +1235,6 @@ QStyleOptionToolBar::QStyleOptionToolBar(int version)
 */
 
 /*!
-    \typedef QStyleOptionTabV2
-    \relates QStyleOptionTab
-    \obsolete
-
-    Synonym for QStyleOptionTab.
-*/
-
-/*!
-    \typedef QStyleOptionTabV3
-    \relates QStyleOptionTab
-    \obsolete
-
-    Synonym for QStyleOptionTab.
-*/
-
-/*!
-    \typedef QStyleOptionTabV4
-    \relates QStyleOptionTab
-    \obsolete
-
-    Synonym for QStyleOptionTab.
-*/
-
-/*!
     Constructs a QStyleOptionTab object, initializing the members
     variables to their default values.
 */
@@ -1512,14 +1472,6 @@ QStyleOptionTab::QStyleOptionTab(int version)
 */
 
 /*!
-    \typedef QStyleOptionProgressBarV2
-    \relates QStyleOptionProgressBar
-    \obsolete
-
-    Synonym for QStyleOptionProgressBar.
-*/
-
-/*!
     Constructs a QStyleOptionProgressBar, initializing the members
     variables to their default values.
 */
@@ -2288,14 +2240,6 @@ QStyleOptionSpinBox::QStyleOptionSpinBox(int version)
 */
 
 /*!
-    \typedef QStyleOptionDockWidgetV2
-    \relates QStyleOptionDockWidget
-    \obsolete
-
-    Synonym for QStyleOptionDockWidget.
-*/
-
-/*!
     Constructs a QStyleOptionDockWidget, initializing the member
     variables to their default values.
 */
@@ -2701,14 +2645,6 @@ QStyleOptionComboBox::QStyleOptionComboBox(int version)
 */
 
 /*!
-    \typedef QStyleOptionToolBoxV2
-    \relates QStyleOptionToolBox
-    \obsolete
-
-    Synonym for QStyleOptionToolBox.
-*/
-
-/*!
     Creates a QStyleOptionToolBox, initializing the members variables
     to their default values.
 */
@@ -3039,30 +2975,6 @@ QStyleOptionTitleBar::QStyleOptionTitleBar(int version)
 */
 
 /*!
-    \typedef QStyleOptionViewItemV2
-    \relates QStyleOptionViewItem
-    \obsolete
-
-    Synonym for QStyleOptionViewItem.
-*/
-
-/*!
-    \typedef QStyleOptionViewItemV3
-    \relates QStyleOptionViewItem
-    \obsolete
-
-    Synonym for QStyleOptionViewItem.
-*/
-
-/*!
-    \typedef QStyleOptionViewItemV4
-    \relates QStyleOptionViewItem
-    \obsolete
-
-    Synonym for QStyleOptionViewItem.
-*/
-
-/*!
     \enum QStyleOptionViewItem::Position
 
     This enum describes the position of the item's decoration.
@@ -3328,14 +3240,6 @@ QStyleOptionViewItem::QStyleOptionViewItem(int version)
 */
 
 /*!
-    \typedef QStyleOptionTabWidgetFrameV2
-    \relates QStyleOptionTabWidgetFrame
-    \obsolete
-
-    Synonym for QStyleOptionTabWidgetFrame.
-*/
-
-/*!
     Constructs a QStyleOptionTabWidgetFrame, initializing the members
     variables to their default values.
 */
@@ -3478,14 +3382,6 @@ QStyleOptionTabWidgetFrame::QStyleOptionTabWidgetFrame(int version)
 */
 
 /*!
-    \typedef QStyleOptionTabBarBaseV2
-    \relates QStyleOptionTabBarBase
-    \obsolete
-
-    Synonym for QStyleOptionTabBarBase.
-*/
-
-/*!
     Construct a QStyleOptionTabBarBase, initializing the members
     vaiables to their default values.
 */
diff --git a/src/widgets/styles/qstyleoption.h b/src/widgets/styles/qstyleoption.h
index 7f3fc4b49e..ab95efa9e1 100644
--- a/src/widgets/styles/qstyleoption.h
+++ b/src/widgets/styles/qstyleoption.h
@@ -151,9 +151,6 @@ protected:
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QStyleOptionFrame::FrameFeatures)
 
-typedef Q_DECL_DEPRECATED QStyleOptionFrame QStyleOptionFrameV2;
-typedef Q_DECL_DEPRECATED QStyleOptionFrame QStyleOptionFrameV3;
-
 #if QT_CONFIG(tabwidget)
 class Q_WIDGETS_EXPORT QStyleOptionTabWidgetFrame : public QStyleOption
 {
@@ -179,7 +176,6 @@ protected:
     QStyleOptionTabWidgetFrame(int version);
 };
 
-typedef Q_DECL_DEPRECATED QStyleOptionTabWidgetFrame QStyleOptionTabWidgetFrameV2;
 #endif // QT_CONFIG(tabwidget)
 
 
@@ -203,7 +199,6 @@ protected:
     QStyleOptionTabBarBase(int version);
 };
 
-typedef Q_DECL_DEPRECATED QStyleOptionTabBarBase QStyleOptionTabBarBaseV2;
 #endif // QT_CONFIG(tabbar)
 
 class Q_WIDGETS_EXPORT QStyleOptionHeader : public QStyleOption
@@ -299,9 +294,6 @@ protected:
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QStyleOptionTab::CornerWidgets)
 
-typedef Q_DECL_DEPRECATED QStyleOptionTab QStyleOptionTabV2;
-typedef Q_DECL_DEPRECATED QStyleOptionTab QStyleOptionTabV3;
-typedef Q_DECL_DEPRECATED QStyleOptionTab QStyleOptionTabV4;
 #endif // QT_CONFIG(tabbar)
 
 
@@ -357,8 +349,6 @@ protected:
     QStyleOptionProgressBar(int version);
 };
 
-typedef Q_DECL_DEPRECATED QStyleOptionProgressBar QStyleOptionProgressBarV2;
-
 class Q_WIDGETS_EXPORT QStyleOptionMenuItem : public QStyleOption
 {
 public:
@@ -408,8 +398,6 @@ protected:
     QStyleOptionDockWidget(int version);
 };
 
-typedef Q_DECL_DEPRECATED QStyleOptionDockWidget QStyleOptionDockWidgetV2;
-
 #if QT_CONFIG(itemviews)
 
 class Q_WIDGETS_EXPORT QStyleOptionViewItem : public QStyleOption
@@ -462,10 +450,6 @@ protected:
 
 Q_DECLARE_OPERATORS_FOR_FLAGS(QStyleOptionViewItem::ViewItemFeatures)
 
-typedef Q_DECL_DEPRECATED QStyleOptionViewItem QStyleOptionViewItemV2;
-typedef Q_DECL_DEPRECATED QStyleOptionViewItem QStyleOptionViewItemV3;
-typedef Q_DECL_DEPRECATED QStyleOptionViewItem QStyleOptionViewItemV4;
-
 #endif // QT_CONFIG(itemviews)
 
 class Q_WIDGETS_EXPORT QStyleOptionToolBox : public QStyleOption
@@ -491,8 +475,6 @@ protected:
     QStyleOptionToolBox(int version);
 };
 
-typedef Q_DECL_DEPRECATED QStyleOptionToolBox QStyleOptionToolBoxV2;
-
 #if QT_CONFIG(rubberband)
 class Q_WIDGETS_EXPORT QStyleOptionRubberBand : public QStyleOption
 {