From b5a8306bf6d4949066872ac2afc8d0a01f716bd7 Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Thu, 26 May 2016 09:27:14 +0200 Subject: Fix Controls 1 types linking to Controls 2 Task-number: QTBUG-53529 Change-Id: I4933a03c49dee4e3edc56dd406f67073da341ac1 Reviewed-by: J-P Nurmi --- src/controls/ApplicationWindow.qml | 1 + src/controls/BusyIndicator.qml | 1 + src/controls/Button.qml | 1 + src/controls/Calendar.qml | 1 + src/controls/CheckBox.qml | 1 + src/controls/ComboBox.qml | 1 + src/controls/GroupBox.qml | 1 + src/controls/Label.qml | 1 + src/controls/Menu.qml | 1 + src/controls/MenuBar.qml | 1 + src/controls/ProgressBar.qml | 1 + src/controls/RadioButton.qml | 1 + src/controls/ScrollView.qml | 1 + src/controls/Slider.qml | 1 + src/controls/SpinBox.qml | 1 + src/controls/SplitView.qml | 1 + src/controls/StackView.qml | 1 + src/controls/StackViewDelegate.qml | 1 + src/controls/StatusBar.qml | 1 + src/controls/Switch.qml | 1 + src/controls/Tab.qml | 1 + src/controls/TabView.qml | 1 + src/controls/TableViewColumn.qml | 1 + src/controls/TextArea.qml | 1 + src/controls/TextField.qml | 1 + src/controls/ToolBar.qml | 1 + src/controls/ToolButton.qml | 1 + src/controls/doc/src/qtquickcontrols-tableview.qdoc | 1 + src/controls/doc/src/qtquickcontrols-treeview.qdoc | 1 + src/extras/Dial.qml | 1 + 30 files changed, 30 insertions(+) diff --git a/src/controls/ApplicationWindow.qml b/src/controls/ApplicationWindow.qml index fb9cdacd..c40cc242 100644 --- a/src/controls/ApplicationWindow.qml +++ b/src/controls/ApplicationWindow.qml @@ -49,6 +49,7 @@ 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 6c9972ad..1912ffbd 100644 --- a/src/controls/BusyIndicator.qml +++ b/src/controls/BusyIndicator.qml @@ -46,6 +46,7 @@ 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 71e657ec..2cdd0766 100644 --- a/src/controls/Button.qml +++ b/src/controls/Button.qml @@ -46,6 +46,7 @@ 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 bbc562cc..e3d8d283 100644 --- a/src/controls/Calendar.qml +++ b/src/controls/Calendar.qml @@ -47,6 +47,7 @@ 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 d2448168..e40cadab 100644 --- a/src/controls/CheckBox.qml +++ b/src/controls/CheckBox.qml @@ -46,6 +46,7 @@ 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 5fcba71b..1b92a1ef 100644 --- a/src/controls/ComboBox.qml +++ b/src/controls/ComboBox.qml @@ -46,6 +46,7 @@ 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 0a414ed2..a36075d5 100644 --- a/src/controls/GroupBox.qml +++ b/src/controls/GroupBox.qml @@ -48,6 +48,7 @@ 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 f9bc8cdd..0df25bf1 100644 --- a/src/controls/Label.qml +++ b/src/controls/Label.qml @@ -46,6 +46,7 @@ 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 f91e8634..4b1e8213 100644 --- a/src/controls/Menu.qml +++ b/src/controls/Menu.qml @@ -48,6 +48,7 @@ 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 a98d0e81..73d06627 100644 --- a/src/controls/MenuBar.qml +++ b/src/controls/MenuBar.qml @@ -48,6 +48,7 @@ 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 9171f7d7..d5f1dd95 100644 --- a/src/controls/ProgressBar.qml +++ b/src/controls/ProgressBar.qml @@ -46,6 +46,7 @@ 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 cc191f5b..01ec2bb7 100644 --- a/src/controls/RadioButton.qml +++ b/src/controls/RadioButton.qml @@ -46,6 +46,7 @@ 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 183991ac..5dd2f5cf 100644 --- a/src/controls/ScrollView.qml +++ b/src/controls/ScrollView.qml @@ -48,6 +48,7 @@ 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 f38db0e4..9072104f 100644 --- a/src/controls/Slider.qml +++ b/src/controls/Slider.qml @@ -46,6 +46,7 @@ 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 999649b0..1fd02cf9 100644 --- a/src/controls/SpinBox.qml +++ b/src/controls/SpinBox.qml @@ -46,6 +46,7 @@ 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 6ad785ba..8d7c324c 100644 --- a/src/controls/SplitView.qml +++ b/src/controls/SplitView.qml @@ -49,6 +49,7 @@ 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 3c8b4e25..46927fb7 100644 --- a/src/controls/StackView.qml +++ b/src/controls/StackView.qml @@ -47,6 +47,7 @@ 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 23a9ee69..ce666cbc 100644 --- a/src/controls/StackViewDelegate.qml +++ b/src/controls/StackViewDelegate.qml @@ -43,6 +43,7 @@ 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 c1168d54..36722dfc 100644 --- a/src/controls/StatusBar.qml +++ b/src/controls/StatusBar.qml @@ -47,6 +47,7 @@ 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 b33f7d00..575b916d 100644 --- a/src/controls/Switch.qml +++ b/src/controls/Switch.qml @@ -46,6 +46,7 @@ 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 657d389c..dac93506 100644 --- a/src/controls/Tab.qml +++ b/src/controls/Tab.qml @@ -45,6 +45,7 @@ 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 2579636f..fff9616b 100644 --- a/src/controls/TabView.qml +++ b/src/controls/TabView.qml @@ -47,6 +47,7 @@ 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 d1fd0c00..ec0da4af 100644 --- a/src/controls/TableViewColumn.qml +++ b/src/controls/TableViewColumn.qml @@ -45,6 +45,7 @@ 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 89877314..db63e6dd 100644 --- a/src/controls/TextArea.qml +++ b/src/controls/TextArea.qml @@ -46,6 +46,7 @@ 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 d6b9b9c9..c57f93b3 100644 --- a/src/controls/TextField.qml +++ b/src/controls/TextField.qml @@ -46,6 +46,7 @@ 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 2e8a8fa3..27ca7b9d 100644 --- a/src/controls/ToolBar.qml +++ b/src/controls/ToolBar.qml @@ -47,6 +47,7 @@ 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 1d5e474f..2e15f161 100644 --- a/src/controls/ToolButton.qml +++ b/src/controls/ToolButton.qml @@ -46,6 +46,7 @@ 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 98c7ca7b..e2dd5026 100644 --- a/src/controls/doc/src/qtquickcontrols-tableview.qdoc +++ b/src/controls/doc/src/qtquickcontrols-tableview.qdoc @@ -32,6 +32,7 @@ \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 4fe92d9c..af49b85e 100644 --- a/src/controls/doc/src/qtquickcontrols-treeview.qdoc +++ b/src/controls/doc/src/qtquickcontrols-treeview.qdoc @@ -32,6 +32,7 @@ \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 688f13d9..67e09d41 100644 --- a/src/extras/Dial.qml +++ b/src/extras/Dial.qml @@ -50,6 +50,7 @@ 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 -- cgit v1.2.1