diff options
| author | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-09-16 22:44:32 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@theqtcompany.com> | 2015-09-16 22:14:36 +0000 |
| commit | 7e6973ad91efd62a3f4e4bb6592dd8e04e7225c0 (patch) | |
| tree | effb1ef2c5aea873a4c432cb901b62144b4bbf53 /src/imports/controls | |
| parent | e4799ad7217f95eb91323bbcf3ed8e87a11ac47d (diff) | |
Docs: move qtquickcontrols qdoc files in the right place
Change-Id: I864eaf25f586c49c03708fb83e8e99b115cdb3a7
Reviewed-by: J-P Nurmi <jpnurmi@theqtcompany.com>
Diffstat (limited to 'src/imports/controls')
74 files changed, 835 insertions, 0 deletions
diff --git a/src/imports/controls/controls.pro b/src/imports/controls/controls.pro index d3b0bbcc..ddf85666 100644 --- a/src/imports/controls/controls.pro +++ b/src/imports/controls/controls.pro @@ -5,6 +5,8 @@ IMPORT_VERSION = 2.0 QT += qml quick QT += core-private gui-private qml-private quick-private quicktemplates-private +QMAKE_DOCS = $$PWD/doc/qtquickcontrols2.qdocconf + OTHER_FILES += \ qmldir diff --git a/src/imports/controls/doc/images/qtquickcontrols2-busyindicator-background.png b/src/imports/controls/doc/images/qtquickcontrols2-busyindicator-background.png Binary files differnew file mode 100644 index 00000000..84cd2ed9 --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-busyindicator-background.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-busyindicator-indicator.png b/src/imports/controls/doc/images/qtquickcontrols2-busyindicator-indicator.png Binary files differnew file mode 100644 index 00000000..87db05a1 --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-busyindicator-indicator.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-busyindicator.gif b/src/imports/controls/doc/images/qtquickcontrols2-busyindicator.gif Binary files differnew file mode 100644 index 00000000..46633c34 --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-busyindicator.gif diff --git a/src/imports/controls/doc/images/qtquickcontrols2-button-background.png b/src/imports/controls/doc/images/qtquickcontrols2-button-background.png Binary files differnew file mode 100644 index 00000000..f8e9342c --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-button-background.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-button-disabled.png b/src/imports/controls/doc/images/qtquickcontrols2-button-disabled.png Binary files differnew file mode 100644 index 00000000..9b9d1eb3 --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-button-disabled.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-button-focused.png b/src/imports/controls/doc/images/qtquickcontrols2-button-focused.png Binary files differnew file mode 100644 index 00000000..172bf9fe --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-button-focused.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-button-label.png b/src/imports/controls/doc/images/qtquickcontrols2-button-label.png Binary files differnew file mode 100644 index 00000000..6875fc06 --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-button-label.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-button-normal.png b/src/imports/controls/doc/images/qtquickcontrols2-button-normal.png Binary files differnew file mode 100644 index 00000000..f59669a2 --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-button-normal.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-button-pressed.png b/src/imports/controls/doc/images/qtquickcontrols2-button-pressed.png Binary files differnew file mode 100644 index 00000000..c9b14992 --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-button-pressed.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-button.gif b/src/imports/controls/doc/images/qtquickcontrols2-button.gif Binary files differnew file mode 100644 index 00000000..9f08f458 --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-button.gif diff --git a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-background.png b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-background.png Binary files differnew file mode 100644 index 00000000..81198821 --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-background.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-checked.png b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-checked.png Binary files differnew file mode 100644 index 00000000..f44428e0 --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-checked.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-disabled.png b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-disabled.png Binary files differnew file mode 100644 index 00000000..ca31061a --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-disabled.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-focused.png b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-focused.png Binary files differnew file mode 100644 index 00000000..7847fb9b --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-focused.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-indicator.png b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-indicator.png Binary files differnew file mode 100644 index 00000000..7c6148b6 --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-indicator.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-label.png b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-label.png Binary files differnew file mode 100644 index 00000000..5bef6df5 --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-label.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-normal.png b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-normal.png Binary files differnew file mode 100644 index 00000000..790ebc93 --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-normal.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-frame-background.png b/src/imports/controls/doc/images/qtquickcontrols2-frame-background.png Binary files differnew file mode 100644 index 00000000..e09960fc --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-frame-background.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-frame-frame.png b/src/imports/controls/doc/images/qtquickcontrols2-frame-frame.png Binary files differnew file mode 100644 index 00000000..bfdf9c1b --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-frame-frame.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-groupbox-background.png b/src/imports/controls/doc/images/qtquickcontrols2-groupbox-background.png Binary files differnew file mode 100644 index 00000000..36e9aa0f --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-groupbox-background.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-groupbox-frame.png b/src/imports/controls/doc/images/qtquickcontrols2-groupbox-frame.png Binary files differnew file mode 100644 index 00000000..11b075d7 --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-groupbox-frame.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-groupbox-label.png b/src/imports/controls/doc/images/qtquickcontrols2-groupbox-label.png Binary files differnew file mode 100644 index 00000000..67ccb4c1 --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-groupbox-label.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-progressbar-background.png b/src/imports/controls/doc/images/qtquickcontrols2-progressbar-background.png Binary files differnew file mode 100644 index 00000000..0fd77835 --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-progressbar-background.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-progressbar-disabled.png b/src/imports/controls/doc/images/qtquickcontrols2-progressbar-disabled.png Binary files differnew file mode 100644 index 00000000..4baf5c83 --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-progressbar-disabled.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-progressbar-indicator.png b/src/imports/controls/doc/images/qtquickcontrols2-progressbar-indicator.png Binary files differnew file mode 100644 index 00000000..02e888ed --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-progressbar-indicator.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-progressbar-normal.png b/src/imports/controls/doc/images/qtquickcontrols2-progressbar-normal.png Binary files differnew file mode 100644 index 00000000..783d721d --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-progressbar-normal.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-background.png b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-background.png Binary files differnew file mode 100644 index 00000000..3ee9590e --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-background.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-checked.png b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-checked.png Binary files differnew file mode 100644 index 00000000..9f71b6b6 --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-checked.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-disabled.png b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-disabled.png Binary files differnew file mode 100644 index 00000000..f7fbcb7c --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-disabled.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-focused.png b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-focused.png Binary files differnew file mode 100644 index 00000000..dfb8d51e --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-focused.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-indicator.png b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-indicator.png Binary files differnew file mode 100644 index 00000000..f9e91709 --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-indicator.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-label.png b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-label.png Binary files differnew file mode 100644 index 00000000..16c0ee08 --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-label.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-normal.png b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-normal.png Binary files differnew file mode 100644 index 00000000..5a2d4bca --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-normal.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-scrollbar-background.png b/src/imports/controls/doc/images/qtquickcontrols2-scrollbar-background.png Binary files differnew file mode 100644 index 00000000..770f546c --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-scrollbar-background.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-scrollbar-handle.png b/src/imports/controls/doc/images/qtquickcontrols2-scrollbar-handle.png Binary files differnew file mode 100644 index 00000000..aafa90a7 --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-scrollbar-handle.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-scrollindicator-background.png b/src/imports/controls/doc/images/qtquickcontrols2-scrollindicator-background.png Binary files differnew file mode 100644 index 00000000..e8947aa0 --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-scrollindicator-background.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-scrollindicator-indicator.png b/src/imports/controls/doc/images/qtquickcontrols2-scrollindicator-indicator.png Binary files differnew file mode 100644 index 00000000..9d969f16 --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-scrollindicator-indicator.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-slider-background.png b/src/imports/controls/doc/images/qtquickcontrols2-slider-background.png Binary files differnew file mode 100644 index 00000000..35fb12ca --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-slider-background.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-slider-disabled.png b/src/imports/controls/doc/images/qtquickcontrols2-slider-disabled.png Binary files differnew file mode 100644 index 00000000..7d4584f8 --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-slider-disabled.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-slider-focused.png b/src/imports/controls/doc/images/qtquickcontrols2-slider-focused.png Binary files differnew file mode 100644 index 00000000..7f9ad18b --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-slider-focused.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-slider-handle.png b/src/imports/controls/doc/images/qtquickcontrols2-slider-handle.png Binary files differnew file mode 100644 index 00000000..7878e0f8 --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-slider-handle.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-slider-normal.png b/src/imports/controls/doc/images/qtquickcontrols2-slider-normal.png Binary files differnew file mode 100644 index 00000000..dac102de --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-slider-normal.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-slider-track.png b/src/imports/controls/doc/images/qtquickcontrols2-slider-track.png Binary files differnew file mode 100644 index 00000000..868fa420 --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-slider-track.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-slider.gif b/src/imports/controls/doc/images/qtquickcontrols2-slider.gif Binary files differnew file mode 100644 index 00000000..59c94796 --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-slider.gif diff --git a/src/imports/controls/doc/images/qtquickcontrols2-switch-background.png b/src/imports/controls/doc/images/qtquickcontrols2-switch-background.png Binary files differnew file mode 100644 index 00000000..bfa24fe6 --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-switch-background.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-switch-checked.png b/src/imports/controls/doc/images/qtquickcontrols2-switch-checked.png Binary files differnew file mode 100644 index 00000000..fadf851a --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-switch-checked.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-switch-disabled.png b/src/imports/controls/doc/images/qtquickcontrols2-switch-disabled.png Binary files differnew file mode 100644 index 00000000..328ff6a9 --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-switch-disabled.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-switch-focused.png b/src/imports/controls/doc/images/qtquickcontrols2-switch-focused.png Binary files differnew file mode 100644 index 00000000..795868b8 --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-switch-focused.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-switch-indicator.png b/src/imports/controls/doc/images/qtquickcontrols2-switch-indicator.png Binary files differnew file mode 100644 index 00000000..5fc9c83b --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-switch-indicator.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-switch-label.png b/src/imports/controls/doc/images/qtquickcontrols2-switch-label.png Binary files differnew file mode 100644 index 00000000..57deabc6 --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-switch-label.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-switch-normal.png b/src/imports/controls/doc/images/qtquickcontrols2-switch-normal.png Binary files differnew file mode 100644 index 00000000..a162e898 --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-switch-normal.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-switch.gif b/src/imports/controls/doc/images/qtquickcontrols2-switch.gif Binary files differnew file mode 100644 index 00000000..b2e1b548 --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-switch.gif diff --git a/src/imports/controls/doc/images/qtquickcontrols2-textfield-background.png b/src/imports/controls/doc/images/qtquickcontrols2-textfield-background.png Binary files differnew file mode 100644 index 00000000..a2908200 --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-textfield-background.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-textfield-disabled.png b/src/imports/controls/doc/images/qtquickcontrols2-textfield-disabled.png Binary files differnew file mode 100644 index 00000000..bb5b779e --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-textfield-disabled.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-textfield-focused.png b/src/imports/controls/doc/images/qtquickcontrols2-textfield-focused.png Binary files differnew file mode 100644 index 00000000..5d8592c1 --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-textfield-focused.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-textfield-normal.png b/src/imports/controls/doc/images/qtquickcontrols2-textfield-normal.png Binary files differnew file mode 100644 index 00000000..26ad9c11 --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-textfield-normal.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-textfield-placeholder.png b/src/imports/controls/doc/images/qtquickcontrols2-textfield-placeholder.png Binary files differnew file mode 100644 index 00000000..b040315f --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-textfield-placeholder.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-background.png b/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-background.png Binary files differnew file mode 100644 index 00000000..8f390b49 --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-background.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-checked.png b/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-checked.png Binary files differnew file mode 100644 index 00000000..fa883751 --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-checked.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-disabled.png b/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-disabled.png Binary files differnew file mode 100644 index 00000000..794692b0 --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-disabled.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-focused.png b/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-focused.png Binary files differnew file mode 100644 index 00000000..f52e4686 --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-focused.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-indicator.png b/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-indicator.png Binary files differnew file mode 100644 index 00000000..97e06e2c --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-indicator.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-label.png b/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-label.png Binary files differnew file mode 100644 index 00000000..3eb3ba35 --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-label.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-normal.png b/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-normal.png Binary files differnew file mode 100644 index 00000000..b066c565 --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-normal.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-toolbar-background.png b/src/imports/controls/doc/images/qtquickcontrols2-toolbar-background.png Binary files differnew file mode 100644 index 00000000..28d4fd98 --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-toolbar-background.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-toolbar-frame.png b/src/imports/controls/doc/images/qtquickcontrols2-toolbar-frame.png Binary files differnew file mode 100644 index 00000000..28d4fd98 --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-toolbar-frame.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-toolbutton-background.png b/src/imports/controls/doc/images/qtquickcontrols2-toolbutton-background.png Binary files differnew file mode 100644 index 00000000..fd105fee --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-toolbutton-background.png diff --git a/src/imports/controls/doc/images/qtquickcontrols2-toolbutton-label.png b/src/imports/controls/doc/images/qtquickcontrols2-toolbutton-label.png Binary files differnew file mode 100644 index 00000000..7aae8dc8 --- /dev/null +++ b/src/imports/controls/doc/images/qtquickcontrols2-toolbutton-label.png diff --git a/src/imports/controls/doc/qtquickcontrols2.qdocconf b/src/imports/controls/doc/qtquickcontrols2.qdocconf new file mode 100644 index 00000000..9e613328 --- /dev/null +++ b/src/imports/controls/doc/qtquickcontrols2.qdocconf @@ -0,0 +1,51 @@ +include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) + +project = QtQuickControls2 +description = Qt Quick Controls 2 Reference Documentation +version = $QT_VERSION + +qhp.projects = QtQuickControls2 + +qhp.QtQuickControls2.file = qtquickcontrols2.qhp +qhp.QtQuickControls2.namespace = org.qt-project.qtquickcontrols2.$QT_VERSION_TAG +qhp.QtQuickControls2.virtualFolder = qtquickcontrols2 +qhp.QtQuickControls2.indexTitle = Qt Quick Controls 2 +qhp.QtQuickControls2.indexRoot = + +qhp.QtQuickControls2.filterAttributes = qtquickcontrols2 $QT_VERSION qtrefdoc +qhp.QtQuickControls2.customFilters.Qt.name = QtQuickControls2 $QT_VERSION +qhp.QtQuickControls2.customFilters.Qt.filterAttributes = qtquickcontrols2 $QT_VERSION + +qhp.QtQuickControls2.subprojects = qtquickcontrols2qmltypes + +qhp.QtQuickControls2.subprojects.qtquickcontrols2qmltypes.title = Controls 2 QML Types +qhp.QtQuickControls2.subprojects.qtquickcontrols2qmltypes.indexTitle = Qt Quick Controls 2 QML Types +qhp.QtQuickControls2.subprojects.qtquickcontrols2qmltypes.selectors = qmlclass +qhp.QtQuickControls2.subprojects.qtquickcontrols2qmltypes.sortPages = true + +depends = qtcore qtgui qtdoc qtqml qtquick qtquicklayouts qtquickdialogs qtquickcontrols qtquickextras2 + +# Specify the install path under QT_INSTALL_EXAMPLES +# Examples will be installed under quick/controls - 'controls' subdirectory +# is given as part of \example commands +exampledirs += ../../../../examples/quick/controls \ + ../ \ + ../../../templates \ + ../../../../tests/auto/snippets/data \ + snippets +examplesinstallpath = quick/controls + +headerdirs += ../../../templates +sourcedirs += ../../../templates + +imagedirs += images + +navigation.landingpage = "Qt Quick Controls 2" +navigation.qmltypespage = "Qt Quick Controls 2 QML Types" + +tagfile = qtquickcontrols2.tags + +# Specify a QML module suffix, applied to html filenames, to avoid +# clashes with Qt Quick Controls 1 documentation. +outputsuffixes = QML +outputsuffixes.QML = 2 diff --git a/src/imports/controls/doc/snippets/basic-example.qml b/src/imports/controls/doc/snippets/basic-example.qml new file mode 100644 index 00000000..62ab2466 --- /dev/null +++ b/src/imports/controls/doc/snippets/basic-example.qml @@ -0,0 +1,43 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: http://www.gnu.org/copyleft/fdl.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +//! [0] +import QtQuick 2.6 +import QtQuick.Controls 2.0 + +ApplicationWindow { + title: "My Application" + width: 640 + height: 480 + visible: true + + Button { + text: "Push Me" + anchors.centerIn: parent + } +} +//! [0] diff --git a/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc new file mode 100644 index 00000000..b099b482 --- /dev/null +++ b/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc @@ -0,0 +1,373 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: http://www.gnu.org/copyleft/fdl.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \page qtquickcontrols2-customize.html + \title Customizing Qt Quick Controls 2 + \brief A set of UI controls to create user interfaces in Qt Quick + + Qt Quick Controls consist of a hierarchy (tree) of items. In order to + provide a custom look and feel, the default QML implementation of each + item can be replaced with a custom one. The following snippets present + the default implementations of various items. These can be used as a + starting point to implement a custom look and feel. + + \section1 Customizing BusyIndicator + + BusyIndicator consists of two visual items: \l {Control::background}{background} + and \l {BusyIndicator::indicator}{indicator}. + + \section3 Background + + \image qtquickcontrols2-busyindicator-background.png + + BusyIndicator has no background item by default. + + \section3 Indicator + + \image qtquickcontrols2-busyindicator-indicator.png + + \snippet BusyIndicator.qml indicator + + + \section1 Customizing Button + + Button consists of two visual items: \l {Control::background}{background} + and \l {AbstractButton::label}{label}. + + \section3 Background + + \image qtquickcontrols2-button-background.png + + \snippet Button.qml background + + \section3 Label + + \image qtquickcontrols2-button-label.png + + \snippet Button.qml label + + + \section1 Customizing CheckBox + + CheckBox consists of three visual items: \l {Control::background}{background}, + \l {AbstractButton::label}{label} and \l {Checkable::indicator}{indicator}. + + \section3 Background + + \image qtquickcontrols2-checkbox-background.png + + CheckBox has no background item by default. + + \section3 Label + + \image qtquickcontrols2-checkbox-label.png + + \snippet CheckBox.qml label + + \section3 Indicator + + \image qtquickcontrols2-checkbox-indicator.png + + \snippet CheckBox.qml indicator + + + \section1 Customizing Frame + + Frame consists of two visual items: \l {Control::background}{background} + and \l {Frame::frame}{frame}. + + \section3 Background + + \image qtquickcontrols2-frame-background.png + + Frame has no background item by default. + + \section3 Frame + + \image qtquickcontrols2-frame-frame.png + + \snippet Frame.qml frame + + + \section1 Customizing GroupBox + + GroupBox consists of three visual items: \l {Control::background}{background}, + \l {Frame::frame}{frame} and \l {GroupBox::label}{label}. + + \section3 Background + + \image qtquickcontrols2-groupbox-background.png + + GroupBox has no background item by default. + + \section3 Frame + + \image qtquickcontrols2-groupbox-frame.png + + \snippet GroupBox.qml frame + + \section3 Label + + \image qtquickcontrols2-groupbox-label.png + + \snippet GroupBox.qml label + + + \section1 Customizing Label + + TODO + + + \section1 Customizing PageIndicator + + TODO + + + \section1 Customizing ProgressBar + + ProgressBar consists of two visual items: \l {Control::background}{background} + and \l {ProgressBar::indicator}{indicator}. + + \section3 Background + + \image qtquickcontrols2-progressbar-background.png + + \snippet ProgressBar.qml background + + \section3 Indicator + + \image qtquickcontrols2-progressbar-indicator.png + + \snippet ProgressBar.qml indicator + + + \section1 Customizing RadioButton + + RadioButton consists of three visual items: \l {Control::background}{background}, + \l {AbstractButton::label}{label} and \l {Checkable::indicator}{indicator}. + + \section3 Background + + \image qtquickcontrols2-radiobutton-background.png + + RadioButton has no background item by default. + + \section3 Label + + \image qtquickcontrols2-radiobutton-label.png + + \snippet RadioButton.qml label + + \section3 Indicator + + \image qtquickcontrols2-radiobutton-indicator.png + + \snippet RadioButton.qml indicator + + + \section1 Customizing ScrollBar + + ScrollBar consists of two visual items: \l {Control::background}{background} + and \l {ScrollBar::handle}{handle}. + + \section3 Background + + \image qtquickcontrols2-scrollbar-background.png + + ScrollBar has no background item by default. + + \section3 Handle + + \image qtquickcontrols2-scrollbar-handle.png + + \snippet ScrollBar.qml handle + + + \section1 Customizing ScrollIndicator + + ScrollIndicator consists of two visual items: \l {Control::background}{background} + and \l {ScrollIndicator::indicator}{indicator}. + + \section3 Background + + \image qtquickcontrols2-scrollindicator-background.png + + ScrollIndicator has no background item by default. + + \section3 Indicator + + \image qtquickcontrols2-scrollindicator-indicator.png + + \snippet ScrollIndicator.qml indicator + + + \section1 Customizing Slider + + Slider consists of three visual items: \l {Control::background}{background}, + \l {Slider::track}{track} and \l {Slider::handle}{handle}. + + \section3 Background + + \image qtquickcontrols2-slider-background.png + + Slider has no background item by default. + + \section3 Track + + \image qtquickcontrols2-slider-track.png + + \snippet Slider.qml track + + \section3 Handle + + \image qtquickcontrols2-slider-handle.png + + \snippet Slider.qml handle + + + \section1 Customizing StackView + + TODO + + + \section1 Customizing Switch + + Switch consists of three visual items: \l {Control::background}{background}, + \l {AbstractButton::label}{label} and \l {Checkable::indicator}{indicator}. + + \section3 Background + + \image qtquickcontrols2-switch-background.png + + Switch has no background item by default. + + \section3 Label + + \image qtquickcontrols2-switch-label.png + + \snippet Switch.qml label + + \section3 Indicator + + \image qtquickcontrols2-switch-indicator.png + + \snippet Switch.qml indicator + + + \section1 Customizing TabBar + + TODO + + + \section1 Customizing TabButton + + TODO + + + \section1 Customizing TextArea + + TODO + + + \section1 Customizing TextField + + TextField consists of two visual items: \l {TextField::background}{background} + and \l {TextField::placeholder}{placeholder}. + + \section3 Background + + \image qtquickcontrols2-textfield-background.png + + \snippet TextField.qml background + + \section3 Placeholder + + \image qtquickcontrols2-textfield-placeholder.png + + \snippet TextField.qml placeholder + + + \section1 Customizing ToggleButton + + ToggleButton consists of three visual items: \l {Control::background}{background}, + \l {AbstractButton::label}{label} and \l {Checkable::indicator}{indicator}. + + \section3 Background + + \image qtquickcontrols2-togglebutton-background.png + + ToggleButton has no background item by default. + + \section3 Label + + \image qtquickcontrols2-togglebutton-label.png + + \snippet ToggleButton.qml label + + \section3 Indicator + + \image qtquickcontrols2-togglebutton-indicator.png + + \snippet ToggleButton.qml indicator + + + \section1 Customizing ToolBar + + ToolBar consists of two visual items: \l {Control::background}{background} and + \l {Frame::frame}{frame}. + + \section3 Background + + \image qtquickcontrols2-toolbar-background.png + + \snippet ToolBar.qml background + + \section3 Frame + + \image qtquickcontrols2-toolbar-frame.png + + ToggleButton has no frame item by default. + + + \section1 Customizing ToolButton + + ToolButton consists of two visual items: \l {Control::background}{background} + and \l {AbstractButton::label}{label}. + + \section3 Background + + \image qtquickcontrols2-toolbutton-background.png + + \snippet ToolButton.qml background + + \section3 Label + + \image qtquickcontrols2-toolbutton-label.png + + \snippet ToolButton.qml label +*/ diff --git a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc new file mode 100644 index 00000000..eefd6c3a --- /dev/null +++ b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc @@ -0,0 +1,320 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: http://www.gnu.org/copyleft/fdl.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \page qtquickcontrols2-index.html + \title Qt Quick Controls 2 + + \brief The Qt Quick Controls 2 module provides a set of UI controls for Qt + Quick. + + The Qt Quick Controls 2 module provides a set of controls that can be used + to build complete interfaces in Qt Quick. + + \section1 QML Types + + \generatelist {qmltypesbymodule QtQuick.Controls} + + \section1 Differences between Qt Quick Controls + + Qt Quick Controls were originally developed to support desktop platforms, + with mobile and embedded support coming shortly afterwards. They have a + very broad scope, in that they provide a styling system flexible enough to + allow the development of applications that have either a platform-dependent + or platform-independent style. + + On embedded systems, where the hardware has limited resources, this approach + can be inefficient. Qt Quick Controls 2 were designed to solve this problem, + using + \l {https://blog.qt.io/blog/2015/03/31/qt-quick-controls-for-embedded/}{benchmarks} + to guide the development. + + \section2 C++ and QML + + In many cases, the internal state of a control can be more efficiently + processed in C++. For example, handling input events in C++ makes a + difference for controls that would otherwise need to create internal + MouseAreas and attached Keys objects. + + \section2 Styles + + Not only does handling events and logic in C++ increase performance, but it + allows the visual QML layer to be a simple, declarative layer on top. This + is reflected in the structure of the controls project: all visual + implementations sit in the \e imports folder, so that users who want to + create their own complete style can copy the folder and start tweaking. + Read more about implementing a style plugin \l {TODO}{here}. + + In Qt Quick Controls 2, styles no longer provide components that are + dynamically instantiated by controls, but controls themselves consist of + item delegates that can be replaced. In effect, this means that delegates + are Qt Quick items that are instantiated on the spot, as properties of the + control, and are simply parented to the control. + + Control-specific style objects have been replaced by a Theme object that + offers a simple set of themable attributes. Basic color adjustments can be + made by setting a few properties that are automatically inherited by the + hierarchy of children. + + \section2 Modularity and Simplicity + + When it comes to more complex controls, it is sometimes better to split + them up into separate building blocks. As an example, the complex + ScrollView control: + + \qml + ScrollView { + horizontalScrollBarPolicy: Qt.ScrollBarAlwaysOff + Flickable { + ... + } + } + \endqml + + Is replaced with simple ScrollBar/ScrollIndicator controls that can be + attached to any Flickable: + + \qml + Flickable { + ... + ScrollBar.vertical: ScrollBar { } + } + \endqml + + The API of Qt Quick Controls 2 aims to be clean and simple. Common + operations are easy, and more advanced ones are liberally documented with + snippets that can be copied into your code. + + \section2 Feature Comparison Table + + \table + \header + \li + \li Qt Quick Controls + \li Qt Quick Controls 2 + \row + \li Stylable delegates + \li Yes + \li Yes + \row + \li Pre-built native styles + \li Yes + \li No + \row + \li Runtime style changes + \li Yes + \li Yes + \row + \li Can be used on Desktop + \li Yes + \li Yes \b * + \row + \li Can be used on Mobile + \li Yes + \li Yes + \row + \li Can be used on Embedded + \li Yes + \li Yes + \row + \li Internal event handling + \li QML + \li C++ + \endtable + + \b {* No hover support} + + \section2 Porting Qt Quick Controls Code + + The API of Qt Quick Controls 2 is very similar to Qt Quick Controls, but it + does come with some changes necessary to facilitate the improvements. The + majority of changes are to do with styling; all of a control's delegates + are now accessible in the control itself, instead of in a separate style + object. + + For example, to style a button in Qt Quick Controls: + + \badcode + Button { + style: ButtonStyle { + label: Label { + ... + } + } + } + \endcode + + To style a button in Qt Quick Controls 2: + + \qml + Button { + label: Label { + ... + } + } + \endqml + + \section3 Type Changes + + \table + \header + \li Qt Quick Controls + \li Qt Quick Controls 2 + \row + \li \l [QtQuickControls] {Action} + \li \l No equivalent; see \l [QtQuick] {Shortcut} instead. + \row + \li \l [QtQuickControls] {ApplicationWindow} + \li \l [QtQuickControls2] {ApplicationWindow} + \row + \li \l [QtQuickControls] {BusyIndicator} + \li \l [QtQuickControls2] {BusyIndicator} + \row + \li \l [QtQuickControls] {Button} + \li \l [QtQuickControls2] {Button} + \row + \li \l [QtQuickControls] {Calendar} + \li No equivalent; see \l [QML] {CalendarView} instead. + \row + \li \l [QtQuickControls] {CheckBox} + \li \l [QtQuickControls2] {CheckBox} + \row + \li \l [QtQuickControls] {ExclusiveGroup} + \li \l [QtQuickControls2] {ExclusiveGroup} + \row + \li \l [QtQuickControls] {GroupBox} + + \li \l [QtQuickControls2] {GroupBox}, or \l [QtQuickControls2] {Frame} + if a title is not required. + + \row + \li \l [QtQuickControls] {Label} + \li \l [QtQuickControls2] {Label} + \row + \li \l [QtQuickControls] {ProgressBar} + \li \l [QtQuickControls2] {ProgressBar} + \row + \li \l [QtQuickControls] {RadioButton} + \li \l [QtQuickControls2] {RadioButton} + \row + \li \l [QtQuickControls] {ScrollView} + \li \l [QtQuickControls2] {ScrollBar}, + \l [QtQuickControls2] {ScrollIndicator} + \row + \li \l [QtQuickControls] {Slider} + \li \l [QtQuickControls2] {Slider} + \row + \li \l [QtQuickControls] {SpinBox} + \li No equivalent; see \l [QtQuickExtras2] {Tumbler} instead. + \row + \li \l [QtQuickControls] {Stack}, + \l [QtQuickControls] {StackView}, + \l [QtQuickControls] {StackViewDelegate} + \li \l [QtQuickControls2] {StackView} + \row + \li \l [QtQuickControls] {StatusBar} + \li No equivalent + \row + \li \l [QtQuickControls] {Switch} + \li \l [QtQuickControls2] {Switch} + \row + \li \l [QtQuickControls] {Tab}, + \l [QtQuickControls] {TabView} + \li \l [QtQuickControls2] {TabBar} in combination with, for example, + \l [QtQuickExtras2] {SwipeView}. + \row + \li \l [QtQuickControls] {TableView} + \li No equivalent + \row + \li \l [QtQuickControls] {TextArea} + \li \l [QtQuickControls2] {TextArea} + \row + \li \l [QtQuickControls] {TextField} + \li \l [QtQuickControls2] {TextField} + \row + \li \l [QtQuickControls] {ToolBar} + \li \l [QtQuickControls2] {ToolBar} + \row + \li \l [QtQuickControls] {ToolButton} + \li \l [QtQuickControls2] {ToolButton} + \row + \li \l [QtQuickControls] {TreeView} + \li No equivalent + \endtable + + \section1 Getting Started + + A basic example of a QML file that makes use of controls is shown here: + + \snippet basic-example.qml 0 + + \section1 Setting Up Controls from C++ + + Although QQuickView has traditionally been used to display QML files in a + C++ application, doing this means you can only set window properties from + C++. + + With Qt Quick Controls 2, declare an ApplicationWindow as the root item of + your application and launch it by using QQmlApplicationEngine instead. + This ensures that you can control top level window properties from QML. + + A basic example of a source file that makes use of controls is shown here: + + \code + #include <QApplication> + #include <QQmlApplicationEngine> + + int main(int argc, char *argv[]) + { + QGuiApplication app(argc, argv); + QQmlApplicationEngine engine("main.qml"); + return app.exec(); + } + \endcode + + \section2 Using C++ Data From QML + + If you need to register a C++ class to use from QML, you can call + qmlRegisterType() before declaring your QQmlApplicationEngine. + See \l [QtQml] {Defining QML Types from C++} for more information. + + If you need to expose data to QML components, you need to make them + available to the context of the current QML engine. See QQmlContext for + more information. + + \section2 Deploying Qt Quick Controls 2 + + TODO + + \section1 Related information + + \list + \li \l{Qt Quick} + \li \l{Qt Quick Layouts} + \li \l{Qt Quick Controls 2 QML Types}{Qt Quick Controls 2 QML Types} + \endlist +*/ diff --git a/src/imports/controls/doc/src/qtquickcontrols2.qdoc b/src/imports/controls/doc/src/qtquickcontrols2.qdoc new file mode 100644 index 00000000..9b52b09e --- /dev/null +++ b/src/imports/controls/doc/src/qtquickcontrols2.qdoc @@ -0,0 +1,46 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see http://www.qt.io/terms-conditions. For further +** information use the contact form at http://www.qt.io/contact-us. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: http://www.gnu.org/copyleft/fdl.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +/*! + \qmlmodule QtQuick.Controls 2.0 + \title Qt Quick Controls 2 QML Types + \ingroup qmlmodules + \brief Provides QML types for user interfaces. + + The \l{Qt Quick Controls 2} module provides QML types for creating user + interfaces. These QML types work in conjunction with \l{Qt Quick} and + \l{Qt Quick Layouts}. + + The QML types can be imported into your application using the + following import statement in your .qml file. + + \code + import QtQuick.Controls 2.0 + \endcode + + \section1 QML Types +*/ |
