diff options
| author | Jens Bache-Wiig <jens.bache-wiig@digia.com> | 2013-08-30 12:13:31 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-10 11:20:29 +0200 |
| commit | 0e4a9eba4052c4ad447b06c4575c30f77b4f3237 (patch) | |
| tree | c56717ed57ce17ac96cde788b1c92e4879375428 /src | |
| parent | 37b0b8176537923ec77621c114e8ac2deb307b33 (diff) | |
| download | qtquickcontrols-0e4a9eba4052c4ad447b06c4575c30f77b4f3237.tar.gz | |
Update imports to 1.1 and remove version from qmlmodule definition
Change-Id: Icb4c6d78225c072da787e4646a55d8cf71a5db7a
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
Diffstat (limited to 'src')
80 files changed, 138 insertions, 138 deletions
diff --git a/src/controls/ApplicationWindow.qml b/src/controls/ApplicationWindow.qml index 364b2b11..52acc3f8 100644 --- a/src/controls/ApplicationWindow.qml +++ b/src/controls/ApplicationWindow.qml @@ -40,14 +40,14 @@ import QtQuick.Window 2.1 import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 import QtQuick.Layouts 1.0 import QtQuick.Controls.Private 1.0 /*! \qmltype ApplicationWindow \since QtQuick.Controls 1.0 - \inqmlmodule QtQuick.Controls 1.0 + \inqmlmodule QtQuick.Controls \ingroup applicationwindow \brief Provides a top-level application window. diff --git a/src/controls/BusyIndicator.qml b/src/controls/BusyIndicator.qml index bf8b0952..0c9518e6 100644 --- a/src/controls/BusyIndicator.qml +++ b/src/controls/BusyIndicator.qml @@ -44,7 +44,7 @@ import QtQuick.Controls.Private 1.0 /*! \qmltype BusyIndicator - \inqmlmodule QtQuick.Controls 1.1 + \inqmlmodule QtQuick.Controls \since QtQuick.Controls 1.1 \ingroup controls \brief A busy indicator. diff --git a/src/controls/Button.qml b/src/controls/Button.qml index f724e5af..b6611b9d 100644 --- a/src/controls/Button.qml +++ b/src/controls/Button.qml @@ -39,12 +39,12 @@ ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 import QtQuick.Controls.Private 1.0 /*! \qmltype Button - \inqmlmodule QtQuick.Controls 1.0 + \inqmlmodule QtQuick.Controls \since QtQuick.Controls 1.0 \ingroup controls \brief A push button with a text label. diff --git a/src/controls/CheckBox.qml b/src/controls/CheckBox.qml index 48d5e8b2..ab6b3da5 100644 --- a/src/controls/CheckBox.qml +++ b/src/controls/CheckBox.qml @@ -39,12 +39,12 @@ ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 import QtQuick.Controls.Private 1.0 /*! \qmltype CheckBox - \inqmlmodule QtQuick.Controls 1.0 + \inqmlmodule QtQuick.Controls \since QtQuick.Controls 1.0 \ingroup controls \brief A checkbox with a text label. diff --git a/src/controls/ComboBox.qml b/src/controls/ComboBox.qml index 75af9844..4af49c14 100644 --- a/src/controls/ComboBox.qml +++ b/src/controls/ComboBox.qml @@ -39,12 +39,12 @@ ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 import QtQuick.Controls.Private 1.0 /*! \qmltype ComboBox - \inqmlmodule QtQuick.Controls 1.0 + \inqmlmodule QtQuick.Controls \since QtQuick.Controls 1.0 \ingroup controls \brief Provides a drop-down list functionality. diff --git a/src/controls/GroupBox.qml b/src/controls/GroupBox.qml index b30c4f8f..5d069f55 100644 --- a/src/controls/GroupBox.qml +++ b/src/controls/GroupBox.qml @@ -39,14 +39,14 @@ ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 import QtQuick.Controls.Private 1.0 -import QtQuick.Controls.Styles 1.0 +import QtQuick.Controls.Styles 1.1 import QtQuick.Layouts 1.0 /*! \qmltype GroupBox - \inqmlmodule QtQuick.Controls 1.0 + \inqmlmodule QtQuick.Controls \since QtQuick.Controls 1.0 \ingroup controls \brief GroupBox provides a group box frame with a title. diff --git a/src/controls/Label.qml b/src/controls/Label.qml index c4ce0ded..4d1ed087 100644 --- a/src/controls/Label.qml +++ b/src/controls/Label.qml @@ -42,7 +42,7 @@ import QtQuick 2.1 /*! \qmltype Label - \inqmlmodule QtQuick.Controls 1.0 + \inqmlmodule QtQuick.Controls \since QtQuick.Controls 1.0 \ingroup controls \brief A text label. diff --git a/src/controls/Menu.qml b/src/controls/Menu.qml index 61c9daa9..1e230ea8 100644 --- a/src/controls/Menu.qml +++ b/src/controls/Menu.qml @@ -39,13 +39,13 @@ ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 -import QtQuick.Controls.Styles 1.0 +import QtQuick.Controls 1.1 +import QtQuick.Controls.Styles 1.1 import QtQuick.Controls.Private 1.0 /*! \qmltype Menu - \inqmlmodule QtQuick.Controls 1.0 + \inqmlmodule QtQuick.Controls \since QtQuick.Controls 1.0 \ingroup menus \brief Provides a menu component for use in menu bars, as context menu, diff --git a/src/controls/MenuBar.qml b/src/controls/MenuBar.qml index 22124af8..85944d23 100644 --- a/src/controls/MenuBar.qml +++ b/src/controls/MenuBar.qml @@ -39,13 +39,13 @@ ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 -import QtQuick.Controls.Styles 1.0 +import QtQuick.Controls 1.1 +import QtQuick.Controls.Styles 1.1 import QtQuick.Controls.Private 1.0 /*! \qmltype MenuBar - \inqmlmodule QtQuick.Controls 1.0 + \inqmlmodule QtQuick.Controls \since QtQuick.Controls 1.0 \ingroup applicationwindow \brief Provides a horizontal menu bar. diff --git a/src/controls/Private/AbstractCheckable.qml b/src/controls/Private/AbstractCheckable.qml index 02348b71..858569e8 100644 --- a/src/controls/Private/AbstractCheckable.qml +++ b/src/controls/Private/AbstractCheckable.qml @@ -39,11 +39,11 @@ ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 /*! \qmltype AbstractCheckable - \inqmlmodule QtQuick.Controls 1.0 + \inqmlmodule QtQuick.Controls \ingroup controls \brief An abstract representation of a checkable control with a label \qmlabstract diff --git a/src/controls/Private/BasicButton.qml b/src/controls/Private/BasicButton.qml index e48b1cda..e069e7c0 100644 --- a/src/controls/Private/BasicButton.qml +++ b/src/controls/Private/BasicButton.qml @@ -39,9 +39,9 @@ ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 import QtQuick.Controls.Private 1.0 -import QtQuick.Controls.Styles 1.0 +import QtQuick.Controls.Styles 1.1 /*! \qmltype BasicButton diff --git a/src/controls/Private/Control.qml b/src/controls/Private/Control.qml index 05916c0a..6b9a4415 100644 --- a/src/controls/Private/Control.qml +++ b/src/controls/Private/Control.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls.Styles 1.0 +import QtQuick.Controls.Styles 1.1 /*! \qmltype Control diff --git a/src/controls/Private/FocusFrame.qml b/src/controls/Private/FocusFrame.qml index 0bf9174a..c81ef11f 100644 --- a/src/controls/Private/FocusFrame.qml +++ b/src/controls/Private/FocusFrame.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 import QtQuick.Controls.Private 1.0 /*! diff --git a/src/controls/Private/ScrollBar.qml b/src/controls/Private/ScrollBar.qml index 110b8b2d..9ee330d3 100644 --- a/src/controls/Private/ScrollBar.qml +++ b/src/controls/Private/ScrollBar.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 import QtQuick.Controls.Private 1.0 /*! diff --git a/src/controls/Private/ScrollViewHelper.qml b/src/controls/Private/ScrollViewHelper.qml index ccad20b2..2037a16f 100644 --- a/src/controls/Private/ScrollViewHelper.qml +++ b/src/controls/Private/ScrollViewHelper.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 import QtQuick.Controls.Private 1.0 /*! diff --git a/src/controls/Private/StackViewSlideDelegate.qml b/src/controls/Private/StackViewSlideDelegate.qml index 6cc1c683..2d9a8c9a 100644 --- a/src/controls/Private/StackViewSlideDelegate.qml +++ b/src/controls/Private/StackViewSlideDelegate.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 /*! \qmltype StackViewSlideTransition diff --git a/src/controls/Private/Style.qml b/src/controls/Private/Style.qml index 6b4c08ef..b06e0a3d 100644 --- a/src/controls/Private/Style.qml +++ b/src/controls/Private/Style.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 import QtQuick.Controls.Private 1.0 /*! diff --git a/src/controls/Private/TabBar.qml b/src/controls/Private/TabBar.qml index 8341c922..1edc5575 100644 --- a/src/controls/Private/TabBar.qml +++ b/src/controls/Private/TabBar.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 /*! \qmltype TabBar diff --git a/src/controls/ProgressBar.qml b/src/controls/ProgressBar.qml index e472e66e..0f127f15 100644 --- a/src/controls/ProgressBar.qml +++ b/src/controls/ProgressBar.qml @@ -39,12 +39,12 @@ ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 import QtQuick.Controls.Private 1.0 /*! \qmltype ProgressBar - \inqmlmodule QtQuick.Controls 1.0 + \inqmlmodule QtQuick.Controls \since QtQuick.Controls 1.0 \ingroup controls \brief A progress indicator. diff --git a/src/controls/RadioButton.qml b/src/controls/RadioButton.qml index fde08817..addee3e1 100644 --- a/src/controls/RadioButton.qml +++ b/src/controls/RadioButton.qml @@ -39,12 +39,12 @@ ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 import QtQuick.Controls.Private 1.0 /*! \qmltype RadioButton - \inqmlmodule QtQuick.Controls 1.0 + \inqmlmodule QtQuick.Controls \since QtQuick.Controls 1.0 \ingroup controls \brief A radio button with a text label. diff --git a/src/controls/ScrollView.qml b/src/controls/ScrollView.qml index 7d3d1d9d..5717d70f 100644 --- a/src/controls/ScrollView.qml +++ b/src/controls/ScrollView.qml @@ -39,13 +39,13 @@ ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 import QtQuick.Controls.Private 1.0 -import QtQuick.Controls.Styles 1.0 +import QtQuick.Controls.Styles 1.1 /*! \qmltype ScrollView - \inqmlmodule QtQuick.Controls 1.0 + \inqmlmodule QtQuick.Controls \since QtQuick.Controls 1.0 \ingroup views \brief Provides a scrolling view within another Item. diff --git a/src/controls/Slider.qml b/src/controls/Slider.qml index 0755a817..7e01d5c7 100644 --- a/src/controls/Slider.qml +++ b/src/controls/Slider.qml @@ -39,12 +39,12 @@ ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 import QtQuick.Controls.Private 1.0 /*! \qmltype Slider - \inqmlmodule QtQuick.Controls 1.0 + \inqmlmodule QtQuick.Controls \since QtQuick.Controls 1.0 \ingroup controls \brief Provides a vertical or horizontal slider control. diff --git a/src/controls/SpinBox.qml b/src/controls/SpinBox.qml index a952838c..473fe6db 100644 --- a/src/controls/SpinBox.qml +++ b/src/controls/SpinBox.qml @@ -39,12 +39,12 @@ ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 import QtQuick.Controls.Private 1.0 /*! \qmltype SpinBox - \inqmlmodule QtQuick.Controls 1.0 + \inqmlmodule QtQuick.Controls \since QtQuick.Controls 1.0 \ingroup controls \brief Provides a spin box control. diff --git a/src/controls/SplitView.qml b/src/controls/SplitView.qml index e8d6fc9a..a63a2d6f 100644 --- a/src/controls/SplitView.qml +++ b/src/controls/SplitView.qml @@ -39,13 +39,13 @@ ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 import QtQuick.Layouts 1.0 import QtQuick.Controls.Private 1.0 as Private /*! \qmltype SplitView - \inqmlmodule QtQuick.Controls 1.0 + \inqmlmodule QtQuick.Controls \since QtQuick.Controls 1.0 \ingroup views \brief Lays out items with a draggable splitter between each item. diff --git a/src/controls/StackView.qml b/src/controls/StackView.qml index 1f7eb1ab..d2af0d6c 100644 --- a/src/controls/StackView.qml +++ b/src/controls/StackView.qml @@ -39,14 +39,14 @@ ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 import QtQuick.Controls.Private 1.0 /*! \qmltype StackView \inherits Item \ingroup views - \inqmlmodule QtQuick.Controls 1.0 + \inqmlmodule QtQuick.Controls \since QtQuick.Controls 1.0 \brief Provides a stack-based navigation model. diff --git a/src/controls/StackViewDelegate.qml b/src/controls/StackViewDelegate.qml index 0e249965..a2490b1a 100644 --- a/src/controls/StackViewDelegate.qml +++ b/src/controls/StackViewDelegate.qml @@ -42,7 +42,7 @@ import QtQuick 2.1 /*! \qmltype StackViewDelegate - \inqmlmodule QtQuick.Controls 1.0 + \inqmlmodule QtQuick.Controls \since QtQuick.Controls 1.0 \brief A delegate used by StackView for loading transitions. diff --git a/src/controls/StatusBar.qml b/src/controls/StatusBar.qml index 85cc6681..303da729 100644 --- a/src/controls/StatusBar.qml +++ b/src/controls/StatusBar.qml @@ -39,12 +39,12 @@ ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 import QtQuick.Controls.Private 1.0 /*! \qmltype StatusBar - \inqmlmodule QtQuick.Controls 1.0 + \inqmlmodule QtQuick.Controls \since QtQuick.Controls 1.0 \ingroup applicationwindow \brief Contains status information in your app. @@ -59,7 +59,7 @@ import QtQuick.Controls.Private 1.0 Otherwise the height is platform dependent. \code - import QtQuick.Controls 1.0 + import QtQuick.Controls 1.1 import QtQuick.Layouts 1.0 ApplicationWindow { diff --git a/src/controls/Styles/Base/ButtonStyle.qml b/src/controls/Styles/Base/ButtonStyle.qml index aea5f721..768d5ab1 100644 --- a/src/controls/Styles/Base/ButtonStyle.qml +++ b/src/controls/Styles/Base/ButtonStyle.qml @@ -38,12 +38,12 @@ ** ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 import QtQuick.Controls.Private 1.0 /*! \qmltype ButtonStyle - \inqmlmodule QtQuick.Controls.Styles 1.0 + \inqmlmodule QtQuick.Controls.Styles \since QtQuick.Controls.Styles 1.0 \ingroup controlsstyling \brief Provides custom styling for Button diff --git a/src/controls/Styles/Base/CheckBoxStyle.qml b/src/controls/Styles/Base/CheckBoxStyle.qml index 18dfec6a..60cd788b 100644 --- a/src/controls/Styles/Base/CheckBoxStyle.qml +++ b/src/controls/Styles/Base/CheckBoxStyle.qml @@ -38,12 +38,12 @@ ** ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 import QtQuick.Controls.Private 1.0 /*! \qmltype CheckBoxStyle - \inqmlmodule QtQuick.Controls.Styles 1.0 + \inqmlmodule QtQuick.Controls.Styles \since QtQuick.Controls.Styles 1.0 \ingroup controlsstyling \brief Provides custom styling for CheckBox diff --git a/src/controls/Styles/Base/ComboBoxStyle.qml b/src/controls/Styles/Base/ComboBoxStyle.qml index 7984a329..5a0ef937 100644 --- a/src/controls/Styles/Base/ComboBoxStyle.qml +++ b/src/controls/Styles/Base/ComboBoxStyle.qml @@ -38,13 +38,13 @@ ** ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 -import QtQuick.Controls.Styles 1.0 +import QtQuick.Controls 1.1 +import QtQuick.Controls.Styles 1.1 import QtQuick.Controls.Private 1.0 /*! \qmltype ComboBoxStyle - \inqmlmodule QtQuick.Controls.Styles 1.0 + \inqmlmodule QtQuick.Controls.Styles \since QtQuick.Controls.Styles 1.0 \ingroup controlsstyling \brief Provides custom styling for ComboBox diff --git a/src/controls/Styles/Base/FocusFrameStyle.qml b/src/controls/Styles/Base/FocusFrameStyle.qml index 6fd50e9a..27edf11c 100644 --- a/src/controls/Styles/Base/FocusFrameStyle.qml +++ b/src/controls/Styles/Base/FocusFrameStyle.qml @@ -38,13 +38,13 @@ ** ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 import QtQuick.Controls.Private 1.0 /*! \qmltype FocusFrameStyle \internal - \inqmlmodule QtQuick.Controls.Styles 1.0 + \inqmlmodule QtQuick.Controls.Styles */ Item { property int margin: -3 diff --git a/src/controls/Styles/Base/GroupBoxStyle.qml b/src/controls/Styles/Base/GroupBoxStyle.qml index 1c3acada..1debd94a 100644 --- a/src/controls/Styles/Base/GroupBoxStyle.qml +++ b/src/controls/Styles/Base/GroupBoxStyle.qml @@ -38,13 +38,13 @@ ** ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 import QtQuick.Controls.Private 1.0 /*! \qmltype GroupBoxStyle \internal - \inqmlmodule QtQuick.Controls.Styles 1.0 + \inqmlmodule QtQuick.Controls.Styles \ingroup controlsstyling \since QtQuick.Controls.Styles 1.0 */ diff --git a/src/controls/Styles/Base/MenuBarStyle.qml b/src/controls/Styles/Base/MenuBarStyle.qml index 895a6ef0..3a3b552d 100644 --- a/src/controls/Styles/Base/MenuBarStyle.qml +++ b/src/controls/Styles/Base/MenuBarStyle.qml @@ -39,14 +39,14 @@ ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 import QtQuick.Controls.Private 1.0 /*! \qmltype MenuBarStyle \internal \ingroup applicationwindowstyling - \inqmlmodule QtQuick.Controls.Styles 1.0 + \inqmlmodule QtQuick.Controls.Styles */ Style { diff --git a/src/controls/Styles/Base/MenuStyle.qml b/src/controls/Styles/Base/MenuStyle.qml index 4b2099f8..9be32459 100644 --- a/src/controls/Styles/Base/MenuStyle.qml +++ b/src/controls/Styles/Base/MenuStyle.qml @@ -39,14 +39,14 @@ ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 import QtQuick.Controls.Private 1.0 /*! \qmltype MenuStyle \internal \ingroup menusstyling - \inqmlmodule QtQuick.Controls.Styles 1.0 + \inqmlmodule QtQuick.Controls.Styles */ Style { diff --git a/src/controls/Styles/Base/ProgressBarStyle.qml b/src/controls/Styles/Base/ProgressBarStyle.qml index ada97c10..eac78269 100644 --- a/src/controls/Styles/Base/ProgressBarStyle.qml +++ b/src/controls/Styles/Base/ProgressBarStyle.qml @@ -39,13 +39,13 @@ ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 import QtQuick.Controls.Private 1.0 /*! \qmltype ProgressBarStyle - \inqmlmodule QtQuick.Controls.Styles 1.0 + \inqmlmodule QtQuick.Controls.Styles \since QtQuick.Controls.Styles 1.0 \ingroup controlsstyling \brief Provides custom styling for ProgressBar diff --git a/src/controls/Styles/Base/RadioButtonStyle.qml b/src/controls/Styles/Base/RadioButtonStyle.qml index bac69d05..4e01a993 100644 --- a/src/controls/Styles/Base/RadioButtonStyle.qml +++ b/src/controls/Styles/Base/RadioButtonStyle.qml @@ -38,12 +38,12 @@ ** ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 import QtQuick.Controls.Private 1.0 /*! \qmltype RadioButtonStyle - \inqmlmodule QtQuick.Controls.Styles 1.0 + \inqmlmodule QtQuick.Controls.Styles \since QtQuick.Controls.Styles 1.0 \ingroup controlsstyling \brief Provides custom styling for RadioButton diff --git a/src/controls/Styles/Base/ScrollViewStyle.qml b/src/controls/Styles/Base/ScrollViewStyle.qml index e8df1a55..a5f4372a 100644 --- a/src/controls/Styles/Base/ScrollViewStyle.qml +++ b/src/controls/Styles/Base/ScrollViewStyle.qml @@ -38,12 +38,12 @@ ** ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 import QtQuick.Controls.Private 1.0 /*! \qmltype ScrollViewStyle - \inqmlmodule QtQuick.Controls.Styles 1.0 + \inqmlmodule QtQuick.Controls.Styles \since QtQuick.Controls.Styles 1.0 \ingroup viewsstyling \brief Provides custom styling for ScrollView diff --git a/src/controls/Styles/Base/SliderStyle.qml b/src/controls/Styles/Base/SliderStyle.qml index 0d341a73..8d22b935 100644 --- a/src/controls/Styles/Base/SliderStyle.qml +++ b/src/controls/Styles/Base/SliderStyle.qml @@ -38,12 +38,12 @@ ** ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 import QtQuick.Controls.Private 1.0 /*! \qmltype SliderStyle - \inqmlmodule QtQuick.Controls.Styles 1.0 + \inqmlmodule QtQuick.Controls.Styles \since QtQuick.Controls.Styles 1.0 \ingroup controlsstyling \brief Provides custom styling for Slider diff --git a/src/controls/Styles/Base/SpinBoxStyle.qml b/src/controls/Styles/Base/SpinBoxStyle.qml index 931db588..c1d137e1 100644 --- a/src/controls/Styles/Base/SpinBoxStyle.qml +++ b/src/controls/Styles/Base/SpinBoxStyle.qml @@ -38,13 +38,13 @@ ** ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 import QtQuick.Controls.Private 1.0 /*! \qmltype SpinBoxStyle \internal - \inqmlmodule QtQuick.Controls.Styles 1.0 + \inqmlmodule QtQuick.Controls.Styles \since QtQuick.Controls.Styles 1.0 \ingroup controlsstyling \brief Provides custom styling for SpinBox diff --git a/src/controls/Styles/Base/StatusBarStyle.qml b/src/controls/Styles/Base/StatusBarStyle.qml index f8ffffd9..578ac7fd 100644 --- a/src/controls/Styles/Base/StatusBarStyle.qml +++ b/src/controls/Styles/Base/StatusBarStyle.qml @@ -38,14 +38,14 @@ ** ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 import QtQuick.Controls.Private 1.0 /*! \qmltype StatusBarStyle \internal \ingroup applicationwindowstyling - \inqmlmodule QtQuick.Controls.Styles 1.0 + \inqmlmodule QtQuick.Controls.Styles \since QtQuick.Controls.Styles 1.0 */ Style { diff --git a/src/controls/Styles/Base/TabViewStyle.qml b/src/controls/Styles/Base/TabViewStyle.qml index d73d9bcb..92fd87fd 100644 --- a/src/controls/Styles/Base/TabViewStyle.qml +++ b/src/controls/Styles/Base/TabViewStyle.qml @@ -38,12 +38,12 @@ ** ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 import QtQuick.Controls.Private 1.0 /*! \qmltype TabViewStyle - \inqmlmodule QtQuick.Controls.Styles 1.0 + \inqmlmodule QtQuick.Controls.Styles \since QtQuick.Controls.Styles 1.0 \ingroup viewsstyling \brief Provides custom styling for TabView diff --git a/src/controls/Styles/Base/TableViewStyle.qml b/src/controls/Styles/Base/TableViewStyle.qml index dd47f7ca..bcc0a2fd 100644 --- a/src/controls/Styles/Base/TableViewStyle.qml +++ b/src/controls/Styles/Base/TableViewStyle.qml @@ -38,12 +38,12 @@ ** ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 import QtQuick.Controls.Private 1.0 /*! \qmltype TableViewStyle - \inqmlmodule QtQuick.Controls.Styles 1.0 + \inqmlmodule QtQuick.Controls.Styles \since QtQuick.Controls.Styles 1.0 \ingroup viewsstyling \brief Provides custom styling for TableView diff --git a/src/controls/Styles/Base/TextFieldStyle.qml b/src/controls/Styles/Base/TextFieldStyle.qml index 16d0fe94..bf4d533b 100644 --- a/src/controls/Styles/Base/TextFieldStyle.qml +++ b/src/controls/Styles/Base/TextFieldStyle.qml @@ -38,12 +38,12 @@ ** ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 import QtQuick.Controls.Private 1.0 /*! \qmltype TextFieldStyle - \inqmlmodule QtQuick.Controls.Styles 1.0 + \inqmlmodule QtQuick.Controls.Styles \since QtQuick.Controls.Styles 1.0 \ingroup controlsstyling \brief Provides custom styling for TextField. diff --git a/src/controls/Styles/Base/ToolBarStyle.qml b/src/controls/Styles/Base/ToolBarStyle.qml index a5c03e7a..51fe8ca7 100644 --- a/src/controls/Styles/Base/ToolBarStyle.qml +++ b/src/controls/Styles/Base/ToolBarStyle.qml @@ -38,14 +38,14 @@ ** ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 import QtQuick.Controls.Private 1.0 /*! \qmltype ToolBarStyle \internal \ingroup applicationwindowstyling - \inqmlmodule QtQuick.Controls.Styles 1.0 + \inqmlmodule QtQuick.Controls.Styles */ Style { diff --git a/src/controls/Styles/Base/ToolButtonStyle.qml b/src/controls/Styles/Base/ToolButtonStyle.qml index 280740e4..4db41a05 100644 --- a/src/controls/Styles/Base/ToolButtonStyle.qml +++ b/src/controls/Styles/Base/ToolButtonStyle.qml @@ -38,14 +38,14 @@ ** ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 import QtQuick.Controls.Private 1.0 /*! \qmltype ToolButtonStyle \internal \ingroup controlsstyling - \inqmlmodule QtQuick.Controls.Styles 1.0 + \inqmlmodule QtQuick.Controls.Styles */ Style { readonly property ToolButton control: __control diff --git a/src/controls/Styles/Desktop/ButtonStyle.qml b/src/controls/Styles/Desktop/ButtonStyle.qml index 2385873e..33e8f0ee 100644 --- a/src/controls/Styles/Desktop/ButtonStyle.qml +++ b/src/controls/Styles/Desktop/ButtonStyle.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 import QtQuick.Controls.Private 1.0 Style { diff --git a/src/controls/Styles/Desktop/CheckBoxStyle.qml b/src/controls/Styles/Desktop/CheckBoxStyle.qml index 6bbb5b1d..2cc688a7 100644 --- a/src/controls/Styles/Desktop/CheckBoxStyle.qml +++ b/src/controls/Styles/Desktop/CheckBoxStyle.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 import QtQuick.Controls.Private 1.0 Style { diff --git a/src/controls/Styles/Desktop/ComboBoxStyle.qml b/src/controls/Styles/Desktop/ComboBoxStyle.qml index 95397641..91a8e82c 100644 --- a/src/controls/Styles/Desktop/ComboBoxStyle.qml +++ b/src/controls/Styles/Desktop/ComboBoxStyle.qml @@ -38,8 +38,8 @@ ** ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 -import QtQuick.Controls.Styles 1.0 +import QtQuick.Controls 1.1 +import QtQuick.Controls.Styles 1.1 import QtQuick.Controls.Private 1.0 Style { diff --git a/src/controls/Styles/Desktop/FocusFrameStyle.qml b/src/controls/Styles/Desktop/FocusFrameStyle.qml index 420a0ab5..0bea860e 100644 --- a/src/controls/Styles/Desktop/FocusFrameStyle.qml +++ b/src/controls/Styles/Desktop/FocusFrameStyle.qml @@ -38,13 +38,13 @@ ** ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 import QtQuick.Controls.Private 1.0 /*! \qmltype FocusFrameStyle \internal - \inqmlmodule QtQuick.Controls.Styles 1.0 + \inqmlmodule QtQuick.Controls.Styles */ StyleItem { property int margin: -3 diff --git a/src/controls/Styles/Desktop/GroupBoxStyle.qml b/src/controls/Styles/Desktop/GroupBoxStyle.qml index 835dd718..0be0a8d6 100644 --- a/src/controls/Styles/Desktop/GroupBoxStyle.qml +++ b/src/controls/Styles/Desktop/GroupBoxStyle.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 import QtQuick.Controls.Private 1.0 diff --git a/src/controls/Styles/Desktop/MenuBarStyle.qml b/src/controls/Styles/Desktop/MenuBarStyle.qml index 291df0fb..41098972 100644 --- a/src/controls/Styles/Desktop/MenuBarStyle.qml +++ b/src/controls/Styles/Desktop/MenuBarStyle.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 import QtQuick.Controls.Private 1.0 diff --git a/src/controls/Styles/Desktop/MenuStyle.qml b/src/controls/Styles/Desktop/MenuStyle.qml index 960a163d..2e3296b6 100644 --- a/src/controls/Styles/Desktop/MenuStyle.qml +++ b/src/controls/Styles/Desktop/MenuStyle.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 import QtQuick.Controls.Private 1.0 Style { diff --git a/src/controls/Styles/Desktop/ProgressBarStyle.qml b/src/controls/Styles/Desktop/ProgressBarStyle.qml index 834b8ab3..70fa0402 100644 --- a/src/controls/Styles/Desktop/ProgressBarStyle.qml +++ b/src/controls/Styles/Desktop/ProgressBarStyle.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 import QtQuick.Controls.Private 1.0 Style { diff --git a/src/controls/Styles/Desktop/RadioButtonStyle.qml b/src/controls/Styles/Desktop/RadioButtonStyle.qml index b41b959a..34d1efa8 100644 --- a/src/controls/Styles/Desktop/RadioButtonStyle.qml +++ b/src/controls/Styles/Desktop/RadioButtonStyle.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 import QtQuick.Controls.Private 1.0 Style { diff --git a/src/controls/Styles/Desktop/ScrollViewStyle.qml b/src/controls/Styles/Desktop/ScrollViewStyle.qml index ff03b3c3..9342d524 100644 --- a/src/controls/Styles/Desktop/ScrollViewStyle.qml +++ b/src/controls/Styles/Desktop/ScrollViewStyle.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 import QtQuick.Controls.Private 1.0 Style { diff --git a/src/controls/Styles/Desktop/SliderStyle.qml b/src/controls/Styles/Desktop/SliderStyle.qml index e435205e..fd426e35 100644 --- a/src/controls/Styles/Desktop/SliderStyle.qml +++ b/src/controls/Styles/Desktop/SliderStyle.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 import QtQuick.Controls.Private 1.0 Style { diff --git a/src/controls/Styles/Desktop/SpinBoxStyle.qml b/src/controls/Styles/Desktop/SpinBoxStyle.qml index 24f51427..6fdd407e 100644 --- a/src/controls/Styles/Desktop/SpinBoxStyle.qml +++ b/src/controls/Styles/Desktop/SpinBoxStyle.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 import QtQuick.Controls.Private 1.0 Style { diff --git a/src/controls/Styles/Desktop/StatusBarStyle.qml b/src/controls/Styles/Desktop/StatusBarStyle.qml index 930ca773..cb3cde47 100644 --- a/src/controls/Styles/Desktop/StatusBarStyle.qml +++ b/src/controls/Styles/Desktop/StatusBarStyle.qml @@ -38,13 +38,13 @@ ** ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 import QtQuick.Controls.Private 1.0 /*! \qmltype StatusBarStyle \internal - \inqmlmodule QtQuick.Controls.Styles 1.0 + \inqmlmodule QtQuick.Controls.Styles */ Style { diff --git a/src/controls/Styles/Desktop/TabViewStyle.qml b/src/controls/Styles/Desktop/TabViewStyle.qml index 51b70ea4..01851711 100644 --- a/src/controls/Styles/Desktop/TabViewStyle.qml +++ b/src/controls/Styles/Desktop/TabViewStyle.qml @@ -38,9 +38,9 @@ ** ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 import QtQuick.Controls.Private 1.0 -import QtQuick.Controls.Styles 1.0 +import QtQuick.Controls.Styles 1.1 Style { id: root diff --git a/src/controls/Styles/Desktop/TableViewStyle.qml b/src/controls/Styles/Desktop/TableViewStyle.qml index 171678a3..d588202d 100644 --- a/src/controls/Styles/Desktop/TableViewStyle.qml +++ b/src/controls/Styles/Desktop/TableViewStyle.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 import QtQuick.Controls.Private 1.0 ScrollViewStyle { diff --git a/src/controls/Styles/Desktop/TextFieldStyle.qml b/src/controls/Styles/Desktop/TextFieldStyle.qml index 53282887..10bcab68 100644 --- a/src/controls/Styles/Desktop/TextFieldStyle.qml +++ b/src/controls/Styles/Desktop/TextFieldStyle.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 import QtQuick.Controls.Private 1.0 Style { diff --git a/src/controls/Styles/Desktop/ToolBarStyle.qml b/src/controls/Styles/Desktop/ToolBarStyle.qml index c295f731..48825fc7 100644 --- a/src/controls/Styles/Desktop/ToolBarStyle.qml +++ b/src/controls/Styles/Desktop/ToolBarStyle.qml @@ -38,13 +38,13 @@ ** ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 import QtQuick.Controls.Private 1.0 /*! \qmltype StatusBarStyle \internal - \inqmlmodule QtQuick.Controls.Styles 1.0 + \inqmlmodule QtQuick.Controls.Styles */ Style { diff --git a/src/controls/Styles/Desktop/ToolButtonStyle.qml b/src/controls/Styles/Desktop/ToolButtonStyle.qml index 25529f11..464210d8 100644 --- a/src/controls/Styles/Desktop/ToolButtonStyle.qml +++ b/src/controls/Styles/Desktop/ToolButtonStyle.qml @@ -38,7 +38,7 @@ ** ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 import QtQuick.Controls.Private 1.0 Style { diff --git a/src/controls/Tab.qml b/src/controls/Tab.qml index 0cf26341..88fd8349 100644 --- a/src/controls/Tab.qml +++ b/src/controls/Tab.qml @@ -42,7 +42,7 @@ import QtQuick 2.1 /*! \qmltype Tab - \inqmlmodule QtQuick.Controls 1.0 + \inqmlmodule QtQuick.Controls \since QtQuick.Controls 1.0 \ingroup viewaddons \brief Tab represents the content of a tab in a TabView. diff --git a/src/controls/TabView.qml b/src/controls/TabView.qml index 6319d72c..e8dd9be8 100644 --- a/src/controls/TabView.qml +++ b/src/controls/TabView.qml @@ -39,12 +39,12 @@ ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 import QtQuick.Controls.Private 1.0 /*! \qmltype TabView - \inqmlmodule QtQuick.Controls 1.0 + \inqmlmodule QtQuick.Controls \since QtQuick.Controls 1.0 \ingroup views \brief A control that allows the user to select one of multiple stacked items. diff --git a/src/controls/TableView.qml b/src/controls/TableView.qml index 68bd4424..9a53e019 100644 --- a/src/controls/TableView.qml +++ b/src/controls/TableView.qml @@ -39,13 +39,13 @@ ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 import QtQuick.Controls.Private 1.0 -import QtQuick.Controls.Styles 1.0 +import QtQuick.Controls.Styles 1.1 /*! \qmltype TableView - \inqmlmodule QtQuick.Controls 1.0 + \inqmlmodule QtQuick.Controls \since QtQuick.Controls 1.0 \ingroup views \brief Provides a list view with scroll bars, styling and header sections. diff --git a/src/controls/TableViewColumn.qml b/src/controls/TableViewColumn.qml index f2e16ac0..81833c02 100644 --- a/src/controls/TableViewColumn.qml +++ b/src/controls/TableViewColumn.qml @@ -42,7 +42,7 @@ import QtQuick 2.1 /*! \qmltype TableViewColumn - \inqmlmodule QtQuick.Controls 1.0 + \inqmlmodule QtQuick.Controls \since QtQuick.Controls 1.0 \ingroup viewitems \brief Used to define columns in a \l TableView. diff --git a/src/controls/TextArea.qml b/src/controls/TextArea.qml index 31762d20..bf2b1c79 100644 --- a/src/controls/TextArea.qml +++ b/src/controls/TextArea.qml @@ -39,11 +39,11 @@ ****************************************************************************/ import QtQuick 2.2 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 import QtQuick.Controls.Private 1.0 /*! \qmltype TextArea - \inqmlmodule QtQuick.Controls 1.0 + \inqmlmodule QtQuick.Controls \since QtQuick.Controls 1.0 \ingroup controls \brief Displays multiple lines of editable formatted text. diff --git a/src/controls/TextField.qml b/src/controls/TextField.qml index 1648ac57..a4867130 100644 --- a/src/controls/TextField.qml +++ b/src/controls/TextField.qml @@ -39,12 +39,12 @@ ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 import QtQuick.Controls.Private 1.0 /*! \qmltype TextField - \inqmlmodule QtQuick.Controls 1.0 + \inqmlmodule QtQuick.Controls \since QtQuick.Controls 1.0 \ingroup controls \brief Displays a single line of editable plain text. @@ -380,7 +380,7 @@ Control { \code import QtQuick 2.1 - import QtQuick.Controls 1.0 + import QtQuick.Controls 1.1 TextField { validator: IntValidator {bottom: 11; top: 31;} diff --git a/src/controls/ToolBar.qml b/src/controls/ToolBar.qml index 093df2e6..379b82e3 100644 --- a/src/controls/ToolBar.qml +++ b/src/controls/ToolBar.qml @@ -39,12 +39,12 @@ ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 import QtQuick.Controls.Private 1.0 /*! \qmltype ToolBar - \inqmlmodule QtQuick.Controls 1.0 + \inqmlmodule QtQuick.Controls \since QtQuick.Controls 1.0 \ingroup applicationwindow \brief Contains ToolButton and related controls. @@ -61,7 +61,7 @@ import QtQuick.Controls.Private 1.0 Otherwise the height is platform dependent. \code - import QtQuick.Controls 1.0 + import QtQuick.Controls 1.1 import QtQuick.Layouts 1.0 ApplicationWindow { diff --git a/src/controls/ToolButton.qml b/src/controls/ToolButton.qml index 7f5fcb7a..410fa027 100644 --- a/src/controls/ToolButton.qml +++ b/src/controls/ToolButton.qml @@ -39,12 +39,12 @@ ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 import QtQuick.Controls.Private 1.0 /*! \qmltype ToolButton - \inqmlmodule QtQuick.Controls 1.0 + \inqmlmodule QtQuick.Controls \since QtQuick.Controls 1.0 \ingroup controls \brief Provides a button type that is typically used within a ToolBar. diff --git a/src/controls/doc/src/qtquickcontrols-overview.qdoc b/src/controls/doc/src/qtquickcontrols-overview.qdoc index 4eb6892f..5dda0375 100644 --- a/src/controls/doc/src/qtquickcontrols-overview.qdoc +++ b/src/controls/doc/src/qtquickcontrols-overview.qdoc @@ -38,7 +38,7 @@ The QML types can be imported into your application using the following import statement in your \c {.qml} file. \code - import QtQuick.Controls 1.0 + import QtQuick.Controls 1.1 \endcode \section1 Creating a basic example @@ -46,7 +46,7 @@ A basic example of a QML file that makes use of controls is shown here: \code - import QtQuick.Controls 1.0 + import QtQuick.Controls 1.1 ApplicationWindow { title: "My Application" diff --git a/src/controls/doc/src/qtquickcontrols.qdoc b/src/controls/doc/src/qtquickcontrols.qdoc index 746d7873..7b161bd1 100644 --- a/src/controls/doc/src/qtquickcontrols.qdoc +++ b/src/controls/doc/src/qtquickcontrols.qdoc @@ -41,7 +41,7 @@ following import statement in your .qml file. \code - import QtQuick.Controls 1.0 + import QtQuick.Controls 1.1 \endcode */ diff --git a/src/controls/doc/src/qtquickcontrolsstyles-index.qdoc b/src/controls/doc/src/qtquickcontrolsstyles-index.qdoc index e035ddba..15678329 100644 --- a/src/controls/doc/src/qtquickcontrolsstyles-index.qdoc +++ b/src/controls/doc/src/qtquickcontrolsstyles-index.qdoc @@ -64,7 +64,7 @@ The QML types can be imported into your application using the following import statement in your \c {.qml} file. \code - import QtQuick.Controls.Styles 1.0 + import QtQuick.Controls.Styles 1.1 \endcode \section1 Styling Views @@ -108,6 +108,6 @@ that can be replaced with custom QML snippets. \code - import QtQuick.Controls.Styles 1.0 + import QtQuick.Controls.Styles 1.1 \endcode */ diff --git a/src/controls/qquickaction.cpp b/src/controls/qquickaction.cpp index aaae51c5..cfd0b4fa 100644 --- a/src/controls/qquickaction.cpp +++ b/src/controls/qquickaction.cpp @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE \qmltype Action \instantiates QQuickAction \ingroup applicationwindow - \inqmlmodule QtQuick.Controls 1.0 + \inqmlmodule QtQuick.Controls \brief Action provides an abstract user interface action that can be bound to items In applications many common commands can be invoked via menus, toolbar buttons, and keyboard diff --git a/src/controls/qquickmenu.cpp b/src/controls/qquickmenu.cpp index f2823f16..b4ceb730 100644 --- a/src/controls/qquickmenu.cpp +++ b/src/controls/qquickmenu.cpp @@ -63,7 +63,7 @@ QT_BEGIN_NAMESPACE \qmltype MenuPrivate \instantiates QQuickMenu \internal - \inqmlmodule QtQuick.Controls 1.0 + \inqmlmodule QtQuick.Controls */ /*! diff --git a/src/controls/qquickmenubar.cpp b/src/controls/qquickmenubar.cpp index e16cb8f0..39235b47 100644 --- a/src/controls/qquickmenubar.cpp +++ b/src/controls/qquickmenubar.cpp @@ -58,7 +58,7 @@ QT_BEGIN_NAMESPACE \qmltype MenuBarPrivate \instantiates QQuickMenuBar \internal - \inqmlmodule QtQuick.Controls 1.0 + \inqmlmodule QtQuick.Controls */ /*! diff --git a/src/controls/qquickmenuitem.cpp b/src/controls/qquickmenuitem.cpp index 1834ffc1..a6325020 100644 --- a/src/controls/qquickmenuitem.cpp +++ b/src/controls/qquickmenuitem.cpp @@ -126,7 +126,7 @@ void QQuickMenuBase::setVisualItem(QQuickItem *item) /*! \qmltype MenuSeparator \instantiates QQuickMenuSeparator - \inqmlmodule QtQuick.Controls 1.0 + \inqmlmodule QtQuick.Controls \ingroup menus \brief MenuSeparator provides a separator for items inside a menu. @@ -244,7 +244,7 @@ void QQuickMenuText::updateIcon() \qmltype MenuItem \instantiates QQuickMenuItem \ingroup menus - \inqmlmodule QtQuick.Controls 1.0 + \inqmlmodule QtQuick.Controls \brief MenuItem provides an item to add in a menu or a menu bar. \code diff --git a/src/controls/qquickstack.cpp b/src/controls/qquickstack.cpp index c949ffeb..b5fe033a 100644 --- a/src/controls/qquickstack.cpp +++ b/src/controls/qquickstack.cpp @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE /*! \qmltype Stack \instantiates QQuickStack - \inqmlmodule QtQuick.Controls 1.0 + \inqmlmodule QtQuick.Controls \brief Provides attached properties for items pushed onto a StackView. The Stack type provides attached properties for items pushed onto a \l StackView. diff --git a/src/layouts/doc/src/snippets/windowconstraints.qml b/src/layouts/doc/src/snippets/windowconstraints.qml index 673169a3..d9411c33 100644 --- a/src/layouts/doc/src/snippets/windowconstraints.qml +++ b/src/layouts/doc/src/snippets/windowconstraints.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.0 -import QtQuick.Controls 1.0 +import QtQuick.Controls 1.1 import QtQuick.Layouts 1.0 ApplicationWindow { |