Revert "Fix Controls 1 types linking to Controls 2"

This reverts commit b5a8306bf6d4949066872ac2afc8d0a01f716bd7.

The incorrect \inherits commands caused property documentation
from base types go missing.

Task-number: QTBUG-54150
Change-Id: I0bbe604a6fe904d8e6a4596777262255a794ec62
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>

30 files changed, 0 insertions, 30 deletions

diff --git a/src/controls/ApplicationWindow.qml b/src/controls/ApplicationWindow.qml
index c40cc242..fb9cdacd 100644
--- a/src/controls/ApplicationWindow.qml
+++ b/src/controls/ApplicationWindow.qml
@@ -49,7 +49,6 @@ import QtQuick.Controls.Private 1.0
     \inqmlmodule QtQuick.Controls
     \ingroup applicationwindow
     \ingroup controls
-    \inherits QtQuick::Window
     \brief Provides a top-level application window.
 
     \image applicationwindow.png
diff --git a/src/controls/BusyIndicator.qml b/src/controls/BusyIndicator.qml
index 1912ffbd..6c9972ad 100644
--- a/src/controls/BusyIndicator.qml
+++ b/src/controls/BusyIndicator.qml
@@ -46,7 +46,6 @@ import QtQuick.Controls.Private 1.0
     \inqmlmodule QtQuick.Controls
     \since 5.2
     \ingroup controls
-    \inherits QtQuickControls1::Control
     \brief A busy indicator.
 
     \image busyindicator.png
diff --git a/src/controls/Button.qml b/src/controls/Button.qml
index 2cdd0766..71e657ec 100644
--- a/src/controls/Button.qml
+++ b/src/controls/Button.qml
@@ -46,7 +46,6 @@ import QtQuick.Controls.Private 1.0
     \inqmlmodule QtQuick.Controls
     \since 5.1
     \ingroup controls
-    \inherits QtQuickControls1::BasicButton
     \brief A push button with a text label.
 
     \image button.png
diff --git a/src/controls/Calendar.qml b/src/controls/Calendar.qml
index e3d8d283..bbc562cc 100644
--- a/src/controls/Calendar.qml
+++ b/src/controls/Calendar.qml
@@ -47,7 +47,6 @@ import QtQuick.Controls.Private 1.0
     \inqmlmodule QtQuick.Controls
     \since 5.3
     \ingroup controls
-    \inherits QtQuickControls1::Control
     \brief Provides a way to select dates from a calendar
 
     \image calendar.png
diff --git a/src/controls/CheckBox.qml b/src/controls/CheckBox.qml
index e40cadab..d2448168 100644
--- a/src/controls/CheckBox.qml
+++ b/src/controls/CheckBox.qml
@@ -46,7 +46,6 @@ import QtQuick.Controls.Private 1.0
     \inqmlmodule QtQuick.Controls
     \since 5.1
     \ingroup controls
-    \inherits QtQuickControls1::AbstractCheckable
     \brief A checkbox with a text label.
 
     \image checkbox.png
diff --git a/src/controls/ComboBox.qml b/src/controls/ComboBox.qml
index 1b92a1ef..5fcba71b 100644
--- a/src/controls/ComboBox.qml
+++ b/src/controls/ComboBox.qml
@@ -46,7 +46,6 @@ import QtQuick.Controls.Private 1.0
     \inqmlmodule QtQuick.Controls
     \since 5.1
     \ingroup controls
-    \inherits QtQuickControls1::Control
     \brief Provides a drop-down list functionality.
 
     \image combobox.png
diff --git a/src/controls/GroupBox.qml b/src/controls/GroupBox.qml
index a36075d5..0a414ed2 100644
--- a/src/controls/GroupBox.qml
+++ b/src/controls/GroupBox.qml
@@ -48,7 +48,6 @@ import QtQuick.Layouts 1.0
     \inqmlmodule QtQuick.Controls
     \since 5.1
     \ingroup controls
-    \inherits QtQuick::FocusScope
     \brief GroupBox provides a group box frame with a title.
 
     \image groupbox.png
diff --git a/src/controls/Label.qml b/src/controls/Label.qml
index 0df25bf1..f9bc8cdd 100644
--- a/src/controls/Label.qml
+++ b/src/controls/Label.qml
@@ -46,7 +46,6 @@ import QtQuick.Controls.Private 1.0
     \inqmlmodule QtQuick.Controls
     \since 5.1
     \ingroup controls
-    \inherits QtQuick::Text
     \brief A text label.
 
     \image label.png
diff --git a/src/controls/Menu.qml b/src/controls/Menu.qml
index 4b1e8213..f91e8634 100644
--- a/src/controls/Menu.qml
+++ b/src/controls/Menu.qml
@@ -48,7 +48,6 @@ import QtQuick.Controls.Private 1.0
     \since 5.1
     \ingroup menus
     \ingroup controls
-    \inherits QtQuickControls1::MenuPrivate
     \brief Provides a menu component for use as a context menu, popup menu, or
     as part of a menu bar.
 
diff --git a/src/controls/MenuBar.qml b/src/controls/MenuBar.qml
index 73d06627..a98d0e81 100644
--- a/src/controls/MenuBar.qml
+++ b/src/controls/MenuBar.qml
@@ -48,7 +48,6 @@ import QtQuick.Controls.Private 1.0
     \since 5.1
     \ingroup applicationwindow
     \ingroup controls
-    \inherits QtQuickControls1::MenuBarPrivate
     \brief Provides a horizontal menu bar.
 
     \image menubar.png
diff --git a/src/controls/ProgressBar.qml b/src/controls/ProgressBar.qml
index d5f1dd95..9171f7d7 100644
--- a/src/controls/ProgressBar.qml
+++ b/src/controls/ProgressBar.qml
@@ -46,7 +46,6 @@ import QtQuick.Controls.Private 1.0
     \inqmlmodule QtQuick.Controls
     \since 5.1
     \ingroup controls
-    \inherits QtQuickControls1::Control
     \brief A progress indicator.
 
     \image progressbar.png
diff --git a/src/controls/RadioButton.qml b/src/controls/RadioButton.qml
index 01ec2bb7..cc191f5b 100644
--- a/src/controls/RadioButton.qml
+++ b/src/controls/RadioButton.qml
@@ -46,7 +46,6 @@ import QtQuick.Controls.Private 1.0
     \inqmlmodule QtQuick.Controls
     \since 5.1
     \ingroup controls
-    \inherits QtQuickControls1::AbstractCheckable
     \brief A radio button with a text label.
 
     \image radiobutton.png
diff --git a/src/controls/ScrollView.qml b/src/controls/ScrollView.qml
index 5dd2f5cf..183991ac 100644
--- a/src/controls/ScrollView.qml
+++ b/src/controls/ScrollView.qml
@@ -48,7 +48,6 @@ import QtQuick.Controls.Styles 1.1
     \since  5.1
     \ingroup views
     \ingroup controls
-    \inherits QtQuick::FocusScope
     \brief Provides a scrolling view within another Item.
 
     \image scrollview.png
diff --git a/src/controls/Slider.qml b/src/controls/Slider.qml
index 9072104f..f38db0e4 100644
--- a/src/controls/Slider.qml
+++ b/src/controls/Slider.qml
@@ -46,7 +46,6 @@ import QtQuick.Controls.Private 1.0
     \inqmlmodule QtQuick.Controls
     \since 5.1
     \ingroup controls
-    \inherits QtQuickControls1::Control
     \brief Provides a vertical or horizontal slider control.
 
     \image slider.png
diff --git a/src/controls/SpinBox.qml b/src/controls/SpinBox.qml
index 1fd02cf9..999649b0 100644
--- a/src/controls/SpinBox.qml
+++ b/src/controls/SpinBox.qml
@@ -46,7 +46,6 @@ import QtQuick.Controls.Private 1.0
     \inqmlmodule QtQuick.Controls
     \since 5.1
     \ingroup controls
-    \inherits QtQuickControls1::Control
     \brief Provides a spin box control.
 
     \image spinbox.png
diff --git a/src/controls/SplitView.qml b/src/controls/SplitView.qml
index 8d7c324c..6ad785ba 100644
--- a/src/controls/SplitView.qml
+++ b/src/controls/SplitView.qml
@@ -49,7 +49,6 @@ import QtQuick.Window 2.1
     \since 5.1
     \ingroup views
     \ingroup controls
-    \inherits QtQuick::Item
     \brief Lays out items with a draggable splitter between each item.
 
     \image splitview.png
diff --git a/src/controls/StackView.qml b/src/controls/StackView.qml
index 46927fb7..3c8b4e25 100644
--- a/src/controls/StackView.qml
+++ b/src/controls/StackView.qml
@@ -47,7 +47,6 @@ import QtQuick.Controls.Private 1.0
     \ingroup views
     \ingroup controls
     \inqmlmodule QtQuick.Controls
-    \inherits QtQuick::FocusScope
     \since 5.1
 
     \brief Provides a stack-based navigation model.
diff --git a/src/controls/StackViewDelegate.qml b/src/controls/StackViewDelegate.qml
index ce666cbc..23a9ee69 100644
--- a/src/controls/StackViewDelegate.qml
+++ b/src/controls/StackViewDelegate.qml
@@ -43,7 +43,6 @@ import QtQuick 2.2
         \qmltype StackViewDelegate
         \inqmlmodule QtQuick.Controls
         \ingroup controls
-        \inherits QtQml::QtObject
         \since 5.1
 
         \brief A delegate used by StackView for loading transitions.
diff --git a/src/controls/StatusBar.qml b/src/controls/StatusBar.qml
index 36722dfc..c1168d54 100644
--- a/src/controls/StatusBar.qml
+++ b/src/controls/StatusBar.qml
@@ -47,7 +47,6 @@ import QtQuick.Controls.Private 1.0
     \since 5.1
     \ingroup applicationwindow
     \ingroup controls
-    \inherits QtQuick::FocusScope
     \brief Contains status information in your app.
 
     The common way of using StatusBar is in relation to \l ApplicationWindow.
diff --git a/src/controls/Switch.qml b/src/controls/Switch.qml
index 575b916d..b33f7d00 100644
--- a/src/controls/Switch.qml
+++ b/src/controls/Switch.qml
@@ -46,7 +46,6 @@ import QtQuick.Controls.Private 1.0
     \inqmlmodule QtQuick.Controls
     \since 5.2
     \ingroup controls
-    \inherits QtQuickControls1::Control
     \brief A switch.
 
     \image switch.png
diff --git a/src/controls/Tab.qml b/src/controls/Tab.qml
index dac93506..657d389c 100644
--- a/src/controls/Tab.qml
+++ b/src/controls/Tab.qml
@@ -45,7 +45,6 @@ import QtQuick 2.2
     \since 5.1
     \ingroup viewaddons
     \ingroup controls
-    \inherits QtQuick::Loader
     \brief Tab represents the content of a tab in a TabView.
 
     A Tab item inherits from Loader and provides a similar
diff --git a/src/controls/TabView.qml b/src/controls/TabView.qml
index fff9616b..2579636f 100644
--- a/src/controls/TabView.qml
+++ b/src/controls/TabView.qml
@@ -47,7 +47,6 @@ import QtQuick.Controls.Private 1.0
     \since 5.1
     \ingroup views
     \ingroup controls
-    \inherits QtQuickControls1::FocusScope
     \brief A control that allows the user to select one of multiple stacked items.
 
     \image tabview.png
diff --git a/src/controls/TableViewColumn.qml b/src/controls/TableViewColumn.qml
index ec0da4af..d1fd0c00 100644
--- a/src/controls/TableViewColumn.qml
+++ b/src/controls/TableViewColumn.qml
@@ -45,7 +45,6 @@ import QtQuick 2.2
     \since 5.1
     \ingroup viewitems
     \ingroup controls
-    \inherits QtQml::QtObject
     \brief Used to define columns in a \l TableView or in a \l TreeView.
 
     \image tableview.png
diff --git a/src/controls/TextArea.qml b/src/controls/TextArea.qml
index db63e6dd..89877314 100644
--- a/src/controls/TextArea.qml
+++ b/src/controls/TextArea.qml
@@ -46,7 +46,6 @@ import QtQuick.Controls.Private 1.0
     \inqmlmodule QtQuick.Controls
     \since 5.1
     \ingroup controls
-    \inherits QtQuickControls1::ScrollView
     \brief Displays multiple lines of editable formatted text.
 
     \image textarea.png
diff --git a/src/controls/TextField.qml b/src/controls/TextField.qml
index c57f93b3..d6b9b9c9 100644
--- a/src/controls/TextField.qml
+++ b/src/controls/TextField.qml
@@ -46,7 +46,6 @@ import QtQuick.Controls.Private 1.0
     \inqmlmodule QtQuick.Controls
     \since 5.1
     \ingroup controls
-    \inherits QtQuickControls1::Control
     \brief Displays a single line of editable plain text.
 
     \image textfield.png
diff --git a/src/controls/ToolBar.qml b/src/controls/ToolBar.qml
index 27ca7b9d..2e8a8fa3 100644
--- a/src/controls/ToolBar.qml
+++ b/src/controls/ToolBar.qml
@@ -47,7 +47,6 @@ import QtQuick.Controls.Private 1.0
     \since 5.1
     \ingroup applicationwindow
     \ingroup controls
-    \inherits QtQuick::FocusScope
     \brief Contains ToolButton and related controls.
 
     \image toolbar.png
diff --git a/src/controls/ToolButton.qml b/src/controls/ToolButton.qml
index 2e15f161..1d5e474f 100644
--- a/src/controls/ToolButton.qml
+++ b/src/controls/ToolButton.qml
@@ -46,7 +46,6 @@ import QtQuick.Controls.Private 1.0
     \inqmlmodule QtQuick.Controls
     \since 5.1
     \ingroup controls
-    \inherits QtQuickControls1::Button
     \brief Provides a button type that is typically used within a ToolBar.
 
     \image toolbar.png
diff --git a/src/controls/doc/src/qtquickcontrols-tableview.qdoc b/src/controls/doc/src/qtquickcontrols-tableview.qdoc
index e2dd5026..98c7ca7b 100644
--- a/src/controls/doc/src/qtquickcontrols-tableview.qdoc
+++ b/src/controls/doc/src/qtquickcontrols-tableview.qdoc
@@ -32,7 +32,6 @@
    \since 5.1
    \ingroup views
    \ingroup controls
-   \inherits QtQuickControls1::BasicTableView
    \brief Provides a list view with scroll bars, styling and header sections.
 
    \image tableview.png
diff --git a/src/controls/doc/src/qtquickcontrols-treeview.qdoc b/src/controls/doc/src/qtquickcontrols-treeview.qdoc
index af49b85e..4fe92d9c 100644
--- a/src/controls/doc/src/qtquickcontrols-treeview.qdoc
+++ b/src/controls/doc/src/qtquickcontrols-treeview.qdoc
@@ -32,7 +32,6 @@
    \since 5.5
    \ingroup views
    \ingroup controls
-   \inherits QtQuickControls1::BasicTableView
    \brief Provides a tree view with scroll bars, styling and header sections.
 
    \image treeview.png
diff --git a/src/extras/Dial.qml b/src/extras/Dial.qml
index 67e09d41..688f13d9 100644
--- a/src/extras/Dial.qml
+++ b/src/extras/Dial.qml
@@ -50,7 +50,6 @@ import QtQuick.Extras.Private 1.0
     \since 5.5
     \ingroup extras
     \ingroup extras-interactive
-    \inherits QtQuickControls1::Control
     \brief A circular dial that is rotated to set a value.
 
     \image dial.png A Dial