From 3f2ac678971694fe6144a4e15197aff2ca38639b Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Wed, 30 Sep 2015 17:47:36 +0200 Subject: Rename QtQuick.Controls 2.0 to Qt.labs.controls 1.0 Change-Id: I142622dd85e95ef70b11132e77ccf48701f2cabc Reviewed-by: Mitch Curtis --- src/imports/controls/ApplicationWindow.qml | 4 +- src/imports/controls/BusyIndicator.qml | 4 +- src/imports/controls/Button.qml | 4 +- src/imports/controls/CheckBox.qml | 4 +- src/imports/controls/Dial.qml | 4 +- src/imports/controls/Drawer.qml | 4 +- src/imports/controls/Frame.qml | 4 +- src/imports/controls/GroupBox.qml | 4 +- src/imports/controls/Label.qml | 4 +- src/imports/controls/PageIndicator.qml | 4 +- src/imports/controls/ProgressBar.qml | 4 +- src/imports/controls/RadioButton.qml | 4 +- src/imports/controls/ScrollBar.qml | 4 +- src/imports/controls/ScrollIndicator.qml | 4 +- src/imports/controls/Slider.qml | 4 +- src/imports/controls/StackView.qml | 4 +- src/imports/controls/SwipeView.qml | 4 +- src/imports/controls/Switch.qml | 4 +- src/imports/controls/TabBar.qml | 4 +- src/imports/controls/TabButton.qml | 4 +- src/imports/controls/TextArea.qml | 4 +- src/imports/controls/TextField.qml | 4 +- src/imports/controls/ToolBar.qml | 4 +- src/imports/controls/ToolButton.qml | 4 +- src/imports/controls/Tumbler.qml | 4 +- src/imports/controls/controls.pro | 12 +- .../controls/designer/BusyIndicatorSpecifics.qml | 2 +- src/imports/controls/designer/ButtonSpecifics.qml | 2 +- .../controls/designer/CheckBoxSpecifics.qml | 2 +- src/imports/controls/designer/ControlSection.qml | 2 +- src/imports/controls/designer/ControlSpecifics.qml | 2 +- src/imports/controls/designer/FrameSpecifics.qml | 2 +- .../controls/designer/GroupBoxSpecifics.qml | 2 +- src/imports/controls/designer/LabelSpecifics.qml | 2 +- src/imports/controls/designer/PaddingSection.qml | 2 +- .../controls/designer/PageIndicatorSpecifics.qml | 2 +- .../controls/designer/ProgressBarSpecifics.qml | 2 +- .../controls/designer/RadioButtonSpecifics.qml | 2 +- src/imports/controls/designer/SliderSpecifics.qml | 2 +- src/imports/controls/designer/SwitchSpecifics.qml | 2 +- .../controls/designer/TextAreaSpecifics.qml | 2 +- .../controls/designer/TextFieldSpecifics.qml | 2 +- src/imports/controls/designer/ToolBarSpecifics.qml | 2 +- .../controls/designer/ToolButtonSpecifics.qml | 2 +- src/imports/controls/designer/designer.pri | 2 +- .../controls/designer/qtlabscontrols.metainfo | 227 ++++++++++++ .../controls/designer/qtquickcontrols2.metainfo | 227 ------------ .../qtlabscontrols-busyindicator-background.png | Bin 0 -> 3919 bytes .../qtlabscontrols-busyindicator-indicator.png | Bin 0 -> 3810 bytes .../doc/images/qtlabscontrols-busyindicator.gif | Bin 0 -> 30448 bytes .../images/qtlabscontrols-button-background.png | Bin 0 -> 1163 bytes .../doc/images/qtlabscontrols-button-disabled.png | Bin 0 -> 1413 bytes .../doc/images/qtlabscontrols-button-focused.png | Bin 0 -> 1445 bytes .../doc/images/qtlabscontrols-button-label.png | Bin 0 -> 1262 bytes .../doc/images/qtlabscontrols-button-normal.png | Bin 0 -> 1220 bytes .../doc/images/qtlabscontrols-button-pressed.png | Bin 0 -> 1542 bytes .../controls/doc/images/qtlabscontrols-button.gif | Bin 0 -> 3913 bytes .../images/qtlabscontrols-checkbox-background.png | Bin 0 -> 2219 bytes .../doc/images/qtlabscontrols-checkbox-checked.png | Bin 0 -> 1884 bytes .../images/qtlabscontrols-checkbox-disabled.png | Bin 0 -> 1898 bytes .../doc/images/qtlabscontrols-checkbox-focused.png | Bin 0 -> 1772 bytes .../images/qtlabscontrols-checkbox-indicator.png | Bin 0 -> 2088 bytes .../doc/images/qtlabscontrols-checkbox-label.png | Bin 0 -> 2159 bytes .../doc/images/qtlabscontrols-checkbox-normal.png | Bin 0 -> 1437 bytes .../doc/images/qtlabscontrols-dial-background.png | Bin 0 -> 3286 bytes .../doc/images/qtlabscontrols-dial-handle.png | Bin 0 -> 3538 bytes .../doc/images/qtlabscontrols-frame-background.png | Bin 0 -> 505 bytes .../doc/images/qtlabscontrols-frame-frame.png | Bin 0 -> 410 bytes .../images/qtlabscontrols-groupbox-background.png | Bin 0 -> 2683 bytes .../doc/images/qtlabscontrols-groupbox-frame.png | Bin 0 -> 2582 bytes .../doc/images/qtlabscontrols-groupbox-label.png | Bin 0 -> 2637 bytes .../qtlabscontrols-progressbar-background.png | Bin 0 -> 244 bytes .../images/qtlabscontrols-progressbar-disabled.png | Bin 0 -> 320 bytes .../qtlabscontrols-progressbar-indicator.png | Bin 0 -> 286 bytes .../images/qtlabscontrols-progressbar-normal.png | Bin 0 -> 322 bytes .../qtlabscontrols-radiobutton-background.png | Bin 0 -> 2875 bytes .../images/qtlabscontrols-radiobutton-checked.png | Bin 0 -> 2292 bytes .../images/qtlabscontrols-radiobutton-disabled.png | Bin 0 -> 2366 bytes .../images/qtlabscontrols-radiobutton-focused.png | Bin 0 -> 2332 bytes .../qtlabscontrols-radiobutton-indicator.png | Bin 0 -> 2726 bytes .../images/qtlabscontrols-radiobutton-label.png | Bin 0 -> 2848 bytes .../images/qtlabscontrols-radiobutton-normal.png | Bin 0 -> 1883 bytes .../images/qtlabscontrols-scrollbar-background.png | Bin 0 -> 268 bytes .../doc/images/qtlabscontrols-scrollbar-handle.png | Bin 0 -> 247 bytes .../qtlabscontrols-scrollindicator-background.png | Bin 0 -> 149 bytes .../qtlabscontrols-scrollindicator-indicator.png | Bin 0 -> 121 bytes .../images/qtlabscontrols-slider-background.png | Bin 0 -> 1172 bytes .../doc/images/qtlabscontrols-slider-disabled.png | Bin 0 -> 1088 bytes .../doc/images/qtlabscontrols-slider-focused.png | Bin 0 -> 1282 bytes .../doc/images/qtlabscontrols-slider-handle.png | Bin 0 -> 1076 bytes .../doc/images/qtlabscontrols-slider-normal.png | Bin 0 -> 1126 bytes .../doc/images/qtlabscontrols-slider-track.png | Bin 0 -> 1006 bytes .../controls/doc/images/qtlabscontrols-slider.gif | Bin 0 -> 13283 bytes .../images/qtlabscontrols-switch-background.png | Bin 0 -> 2136 bytes .../doc/images/qtlabscontrols-switch-checked.png | Bin 0 -> 2344 bytes .../doc/images/qtlabscontrols-switch-disabled.png | Bin 0 -> 2401 bytes .../doc/images/qtlabscontrols-switch-focused.png | Bin 0 -> 2417 bytes .../doc/images/qtlabscontrols-switch-indicator.png | Bin 0 -> 2014 bytes .../doc/images/qtlabscontrols-switch-label.png | Bin 0 -> 2082 bytes .../doc/images/qtlabscontrols-switch-normal.png | Bin 0 -> 1925 bytes .../controls/doc/images/qtlabscontrols-switch.gif | Bin 0 -> 3320 bytes .../images/qtlabscontrols-textfield-background.png | Bin 0 -> 1540 bytes .../images/qtlabscontrols-textfield-disabled.png | Bin 0 -> 1428 bytes .../images/qtlabscontrols-textfield-focused.png | Bin 0 -> 1587 bytes .../doc/images/qtlabscontrols-textfield-normal.png | Bin 0 -> 1261 bytes .../qtlabscontrols-textfield-placeholder.png | Bin 0 -> 1588 bytes .../qtlabscontrols-togglebutton-background.png | Bin 0 -> 2558 bytes .../images/qtlabscontrols-togglebutton-checked.png | Bin 0 -> 1921 bytes .../qtlabscontrols-togglebutton-disabled.png | Bin 0 -> 1921 bytes .../images/qtlabscontrols-togglebutton-focused.png | Bin 0 -> 1788 bytes .../qtlabscontrols-togglebutton-indicator.png | Bin 0 -> 2450 bytes .../images/qtlabscontrols-togglebutton-label.png | Bin 0 -> 2530 bytes .../images/qtlabscontrols-togglebutton-normal.png | Bin 0 -> 1444 bytes .../images/qtlabscontrols-toolbar-background.png | Bin 0 -> 185 bytes .../doc/images/qtlabscontrols-toolbar-frame.png | Bin 0 -> 185 bytes .../qtlabscontrols-toolbutton-background.png | Bin 0 -> 2171 bytes .../doc/images/qtlabscontrols-toolbutton-label.png | Bin 0 -> 2156 bytes .../images/qtlabscontrols-tumbler-background.png | Bin 0 -> 1025 bytes .../images/qtlabscontrols-tumbler-contentItem.png | Bin 0 -> 1025 bytes .../doc/images/qtlabscontrols-tumbler-delegate.png | Bin 0 -> 1047 bytes .../doc/images/qtlabscontrols-tumbler-wrap.gif | Bin 0 -> 38931 bytes .../qtquickcontrols2-busyindicator-background.png | Bin 3919 -> 0 bytes .../qtquickcontrols2-busyindicator-indicator.png | Bin 3810 -> 0 bytes .../doc/images/qtquickcontrols2-busyindicator.gif | Bin 30448 -> 0 bytes .../images/qtquickcontrols2-button-background.png | Bin 1163 -> 0 bytes .../images/qtquickcontrols2-button-disabled.png | Bin 1413 -> 0 bytes .../doc/images/qtquickcontrols2-button-focused.png | Bin 1445 -> 0 bytes .../doc/images/qtquickcontrols2-button-label.png | Bin 1262 -> 0 bytes .../doc/images/qtquickcontrols2-button-normal.png | Bin 1220 -> 0 bytes .../doc/images/qtquickcontrols2-button-pressed.png | Bin 1542 -> 0 bytes .../doc/images/qtquickcontrols2-button.gif | Bin 3913 -> 0 bytes .../qtquickcontrols2-checkbox-background.png | Bin 2219 -> 0 bytes .../images/qtquickcontrols2-checkbox-checked.png | Bin 1884 -> 0 bytes .../images/qtquickcontrols2-checkbox-disabled.png | Bin 1898 -> 0 bytes .../images/qtquickcontrols2-checkbox-focused.png | Bin 1772 -> 0 bytes .../images/qtquickcontrols2-checkbox-indicator.png | Bin 2088 -> 0 bytes .../doc/images/qtquickcontrols2-checkbox-label.png | Bin 2159 -> 0 bytes .../images/qtquickcontrols2-checkbox-normal.png | Bin 1437 -> 0 bytes .../images/qtquickcontrols2-dial-background.png | Bin 3286 -> 0 bytes .../doc/images/qtquickcontrols2-dial-handle.png | Bin 3538 -> 0 bytes .../images/qtquickcontrols2-frame-background.png | Bin 505 -> 0 bytes .../doc/images/qtquickcontrols2-frame-frame.png | Bin 410 -> 0 bytes .../qtquickcontrols2-groupbox-background.png | Bin 2683 -> 0 bytes .../doc/images/qtquickcontrols2-groupbox-frame.png | Bin 2582 -> 0 bytes .../doc/images/qtquickcontrols2-groupbox-label.png | Bin 2637 -> 0 bytes .../qtquickcontrols2-progressbar-background.png | Bin 244 -> 0 bytes .../qtquickcontrols2-progressbar-disabled.png | Bin 320 -> 0 bytes .../qtquickcontrols2-progressbar-indicator.png | Bin 286 -> 0 bytes .../images/qtquickcontrols2-progressbar-normal.png | Bin 322 -> 0 bytes .../qtquickcontrols2-radiobutton-background.png | Bin 2875 -> 0 bytes .../qtquickcontrols2-radiobutton-checked.png | Bin 2292 -> 0 bytes .../qtquickcontrols2-radiobutton-disabled.png | Bin 2366 -> 0 bytes .../qtquickcontrols2-radiobutton-focused.png | Bin 2332 -> 0 bytes .../qtquickcontrols2-radiobutton-indicator.png | Bin 2726 -> 0 bytes .../images/qtquickcontrols2-radiobutton-label.png | Bin 2848 -> 0 bytes .../images/qtquickcontrols2-radiobutton-normal.png | Bin 1883 -> 0 bytes .../qtquickcontrols2-scrollbar-background.png | Bin 268 -> 0 bytes .../images/qtquickcontrols2-scrollbar-handle.png | Bin 247 -> 0 bytes ...qtquickcontrols2-scrollindicator-background.png | Bin 149 -> 0 bytes .../qtquickcontrols2-scrollindicator-indicator.png | Bin 121 -> 0 bytes .../images/qtquickcontrols2-slider-background.png | Bin 1172 -> 0 bytes .../images/qtquickcontrols2-slider-disabled.png | Bin 1088 -> 0 bytes .../doc/images/qtquickcontrols2-slider-focused.png | Bin 1282 -> 0 bytes .../doc/images/qtquickcontrols2-slider-handle.png | Bin 1076 -> 0 bytes .../doc/images/qtquickcontrols2-slider-normal.png | Bin 1126 -> 0 bytes .../doc/images/qtquickcontrols2-slider-track.png | Bin 1006 -> 0 bytes .../doc/images/qtquickcontrols2-slider.gif | Bin 13283 -> 0 bytes .../images/qtquickcontrols2-switch-background.png | Bin 2136 -> 0 bytes .../doc/images/qtquickcontrols2-switch-checked.png | Bin 2344 -> 0 bytes .../images/qtquickcontrols2-switch-disabled.png | Bin 2401 -> 0 bytes .../doc/images/qtquickcontrols2-switch-focused.png | Bin 2417 -> 0 bytes .../images/qtquickcontrols2-switch-indicator.png | Bin 2014 -> 0 bytes .../doc/images/qtquickcontrols2-switch-label.png | Bin 2082 -> 0 bytes .../doc/images/qtquickcontrols2-switch-normal.png | Bin 1925 -> 0 bytes .../doc/images/qtquickcontrols2-switch.gif | Bin 3320 -> 0 bytes .../qtquickcontrols2-textfield-background.png | Bin 1540 -> 0 bytes .../images/qtquickcontrols2-textfield-disabled.png | Bin 1428 -> 0 bytes .../images/qtquickcontrols2-textfield-focused.png | Bin 1587 -> 0 bytes .../images/qtquickcontrols2-textfield-normal.png | Bin 1261 -> 0 bytes .../qtquickcontrols2-textfield-placeholder.png | Bin 1588 -> 0 bytes .../qtquickcontrols2-togglebutton-background.png | Bin 2558 -> 0 bytes .../qtquickcontrols2-togglebutton-checked.png | Bin 1921 -> 0 bytes .../qtquickcontrols2-togglebutton-disabled.png | Bin 1921 -> 0 bytes .../qtquickcontrols2-togglebutton-focused.png | Bin 1788 -> 0 bytes .../qtquickcontrols2-togglebutton-indicator.png | Bin 2450 -> 0 bytes .../images/qtquickcontrols2-togglebutton-label.png | Bin 2530 -> 0 bytes .../qtquickcontrols2-togglebutton-normal.png | Bin 1444 -> 0 bytes .../images/qtquickcontrols2-toolbar-background.png | Bin 185 -> 0 bytes .../doc/images/qtquickcontrols2-toolbar-frame.png | Bin 185 -> 0 bytes .../qtquickcontrols2-toolbutton-background.png | Bin 2171 -> 0 bytes .../images/qtquickcontrols2-toolbutton-label.png | Bin 2156 -> 0 bytes .../images/qtquickcontrols2-tumbler-background.png | Bin 1025 -> 0 bytes .../qtquickcontrols2-tumbler-contentItem.png | Bin 1025 -> 0 bytes .../images/qtquickcontrols2-tumbler-delegate.png | Bin 1047 -> 0 bytes .../doc/images/qtquickcontrols2-tumbler-wrap.gif | Bin 38931 -> 0 bytes src/imports/controls/doc/qtlabscontrols.qdocconf | 52 +++ src/imports/controls/doc/qtquickcontrols2.qdocconf | 57 --- .../controls/doc/snippets/basic-example.qml | 2 +- .../doc/src/calendar/qtlabscalendar-index.qdoc | 2 +- .../controls/doc/src/calendar/qtlabscalendar.qdoc | 4 +- .../controls/doc/src/qtlabscontrols-customize.qdoc | 391 +++++++++++++++++++++ .../controls/doc/src/qtlabscontrols-index.qdoc | 342 ++++++++++++++++++ src/imports/controls/doc/src/qtlabscontrols.qdoc | 60 ++++ .../doc/src/qtquickcontrols2-customize.qdoc | 391 --------------------- .../controls/doc/src/qtquickcontrols2-index.qdoc | 342 ------------------ src/imports/controls/doc/src/qtquickcontrols2.qdoc | 60 ---- src/imports/controls/qmldir | 6 +- src/imports/controls/qquicktheme.cpp | 26 +- src/imports/controls/qquicktheme_p.h | 2 +- src/imports/controls/qquickthemedata.cpp | 6 +- src/imports/controls/qquickthemedata_p.h | 2 +- src/imports/controls/qtlabscontrolsplugin.cpp | 108 ++++++ src/imports/controls/qtlabscontrolsplugin.qrc | 10 + src/imports/controls/qtquickcontrols2plugin.cpp | 108 ------ src/imports/controls/qtquickcontrols2plugin.qrc | 10 - 215 files changed, 1290 insertions(+), 1295 deletions(-) create mode 100644 src/imports/controls/designer/qtlabscontrols.metainfo delete mode 100644 src/imports/controls/designer/qtquickcontrols2.metainfo create mode 100644 src/imports/controls/doc/images/qtlabscontrols-busyindicator-background.png create mode 100644 src/imports/controls/doc/images/qtlabscontrols-busyindicator-indicator.png create mode 100644 src/imports/controls/doc/images/qtlabscontrols-busyindicator.gif create mode 100644 src/imports/controls/doc/images/qtlabscontrols-button-background.png create mode 100644 src/imports/controls/doc/images/qtlabscontrols-button-disabled.png create mode 100644 src/imports/controls/doc/images/qtlabscontrols-button-focused.png create mode 100644 src/imports/controls/doc/images/qtlabscontrols-button-label.png create mode 100644 src/imports/controls/doc/images/qtlabscontrols-button-normal.png create mode 100644 src/imports/controls/doc/images/qtlabscontrols-button-pressed.png create mode 100644 src/imports/controls/doc/images/qtlabscontrols-button.gif create mode 100644 src/imports/controls/doc/images/qtlabscontrols-checkbox-background.png create mode 100644 src/imports/controls/doc/images/qtlabscontrols-checkbox-checked.png create mode 100644 src/imports/controls/doc/images/qtlabscontrols-checkbox-disabled.png create mode 100644 src/imports/controls/doc/images/qtlabscontrols-checkbox-focused.png create mode 100644 src/imports/controls/doc/images/qtlabscontrols-checkbox-indicator.png create mode 100644 src/imports/controls/doc/images/qtlabscontrols-checkbox-label.png create mode 100644 src/imports/controls/doc/images/qtlabscontrols-checkbox-normal.png create mode 100644 src/imports/controls/doc/images/qtlabscontrols-dial-background.png create mode 100644 src/imports/controls/doc/images/qtlabscontrols-dial-handle.png create mode 100644 src/imports/controls/doc/images/qtlabscontrols-frame-background.png create mode 100644 src/imports/controls/doc/images/qtlabscontrols-frame-frame.png create mode 100644 src/imports/controls/doc/images/qtlabscontrols-groupbox-background.png create mode 100644 src/imports/controls/doc/images/qtlabscontrols-groupbox-frame.png create mode 100644 src/imports/controls/doc/images/qtlabscontrols-groupbox-label.png create mode 100644 src/imports/controls/doc/images/qtlabscontrols-progressbar-background.png create mode 100644 src/imports/controls/doc/images/qtlabscontrols-progressbar-disabled.png create mode 100644 src/imports/controls/doc/images/qtlabscontrols-progressbar-indicator.png create mode 100644 src/imports/controls/doc/images/qtlabscontrols-progressbar-normal.png create mode 100644 src/imports/controls/doc/images/qtlabscontrols-radiobutton-background.png create mode 100644 src/imports/controls/doc/images/qtlabscontrols-radiobutton-checked.png create mode 100644 src/imports/controls/doc/images/qtlabscontrols-radiobutton-disabled.png create mode 100644 src/imports/controls/doc/images/qtlabscontrols-radiobutton-focused.png create mode 100644 src/imports/controls/doc/images/qtlabscontrols-radiobutton-indicator.png create mode 100644 src/imports/controls/doc/images/qtlabscontrols-radiobutton-label.png create mode 100644 src/imports/controls/doc/images/qtlabscontrols-radiobutton-normal.png create mode 100644 src/imports/controls/doc/images/qtlabscontrols-scrollbar-background.png create mode 100644 src/imports/controls/doc/images/qtlabscontrols-scrollbar-handle.png create mode 100644 src/imports/controls/doc/images/qtlabscontrols-scrollindicator-background.png create mode 100644 src/imports/controls/doc/images/qtlabscontrols-scrollindicator-indicator.png create mode 100644 src/imports/controls/doc/images/qtlabscontrols-slider-background.png create mode 100644 src/imports/controls/doc/images/qtlabscontrols-slider-disabled.png create mode 100644 src/imports/controls/doc/images/qtlabscontrols-slider-focused.png create mode 100644 src/imports/controls/doc/images/qtlabscontrols-slider-handle.png create mode 100644 src/imports/controls/doc/images/qtlabscontrols-slider-normal.png create mode 100644 src/imports/controls/doc/images/qtlabscontrols-slider-track.png create mode 100644 src/imports/controls/doc/images/qtlabscontrols-slider.gif create mode 100644 src/imports/controls/doc/images/qtlabscontrols-switch-background.png create mode 100644 src/imports/controls/doc/images/qtlabscontrols-switch-checked.png create mode 100644 src/imports/controls/doc/images/qtlabscontrols-switch-disabled.png create mode 100644 src/imports/controls/doc/images/qtlabscontrols-switch-focused.png create mode 100644 src/imports/controls/doc/images/qtlabscontrols-switch-indicator.png create mode 100644 src/imports/controls/doc/images/qtlabscontrols-switch-label.png create mode 100644 src/imports/controls/doc/images/qtlabscontrols-switch-normal.png create mode 100644 src/imports/controls/doc/images/qtlabscontrols-switch.gif create mode 100644 src/imports/controls/doc/images/qtlabscontrols-textfield-background.png create mode 100644 src/imports/controls/doc/images/qtlabscontrols-textfield-disabled.png create mode 100644 src/imports/controls/doc/images/qtlabscontrols-textfield-focused.png create mode 100644 src/imports/controls/doc/images/qtlabscontrols-textfield-normal.png create mode 100644 src/imports/controls/doc/images/qtlabscontrols-textfield-placeholder.png create mode 100644 src/imports/controls/doc/images/qtlabscontrols-togglebutton-background.png create mode 100644 src/imports/controls/doc/images/qtlabscontrols-togglebutton-checked.png create mode 100644 src/imports/controls/doc/images/qtlabscontrols-togglebutton-disabled.png create mode 100644 src/imports/controls/doc/images/qtlabscontrols-togglebutton-focused.png create mode 100644 src/imports/controls/doc/images/qtlabscontrols-togglebutton-indicator.png create mode 100644 src/imports/controls/doc/images/qtlabscontrols-togglebutton-label.png create mode 100644 src/imports/controls/doc/images/qtlabscontrols-togglebutton-normal.png create mode 100644 src/imports/controls/doc/images/qtlabscontrols-toolbar-background.png create mode 100644 src/imports/controls/doc/images/qtlabscontrols-toolbar-frame.png create mode 100644 src/imports/controls/doc/images/qtlabscontrols-toolbutton-background.png create mode 100644 src/imports/controls/doc/images/qtlabscontrols-toolbutton-label.png create mode 100644 src/imports/controls/doc/images/qtlabscontrols-tumbler-background.png create mode 100644 src/imports/controls/doc/images/qtlabscontrols-tumbler-contentItem.png create mode 100644 src/imports/controls/doc/images/qtlabscontrols-tumbler-delegate.png create mode 100644 src/imports/controls/doc/images/qtlabscontrols-tumbler-wrap.gif delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-busyindicator-background.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-busyindicator-indicator.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-busyindicator.gif delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-button-background.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-button-disabled.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-button-focused.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-button-label.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-button-normal.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-button-pressed.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-button.gif delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-checkbox-background.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-checkbox-checked.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-checkbox-disabled.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-checkbox-focused.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-checkbox-indicator.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-checkbox-label.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-checkbox-normal.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-dial-background.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-dial-handle.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-frame-background.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-frame-frame.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-groupbox-background.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-groupbox-frame.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-groupbox-label.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-progressbar-background.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-progressbar-disabled.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-progressbar-indicator.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-progressbar-normal.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-radiobutton-background.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-radiobutton-checked.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-radiobutton-disabled.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-radiobutton-focused.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-radiobutton-indicator.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-radiobutton-label.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-radiobutton-normal.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-scrollbar-background.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-scrollbar-handle.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-scrollindicator-background.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-scrollindicator-indicator.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-slider-background.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-slider-disabled.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-slider-focused.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-slider-handle.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-slider-normal.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-slider-track.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-slider.gif delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-switch-background.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-switch-checked.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-switch-disabled.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-switch-focused.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-switch-indicator.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-switch-label.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-switch-normal.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-switch.gif delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-textfield-background.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-textfield-disabled.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-textfield-focused.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-textfield-normal.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-textfield-placeholder.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-togglebutton-background.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-togglebutton-checked.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-togglebutton-disabled.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-togglebutton-focused.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-togglebutton-indicator.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-togglebutton-label.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-togglebutton-normal.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-toolbar-background.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-toolbar-frame.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-toolbutton-background.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-toolbutton-label.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-tumbler-background.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-tumbler-contentItem.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-tumbler-delegate.png delete mode 100644 src/imports/controls/doc/images/qtquickcontrols2-tumbler-wrap.gif create mode 100644 src/imports/controls/doc/qtlabscontrols.qdocconf delete mode 100644 src/imports/controls/doc/qtquickcontrols2.qdocconf create mode 100644 src/imports/controls/doc/src/qtlabscontrols-customize.qdoc create mode 100644 src/imports/controls/doc/src/qtlabscontrols-index.qdoc create mode 100644 src/imports/controls/doc/src/qtlabscontrols.qdoc delete mode 100644 src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc delete mode 100644 src/imports/controls/doc/src/qtquickcontrols2-index.qdoc delete mode 100644 src/imports/controls/doc/src/qtquickcontrols2.qdoc create mode 100644 src/imports/controls/qtlabscontrolsplugin.cpp create mode 100644 src/imports/controls/qtlabscontrolsplugin.qrc delete mode 100644 src/imports/controls/qtquickcontrols2plugin.cpp delete mode 100644 src/imports/controls/qtquickcontrols2plugin.qrc (limited to 'src/imports/controls') diff --git a/src/imports/controls/ApplicationWindow.qml b/src/imports/controls/ApplicationWindow.qml index 350843da..cb918b84 100644 --- a/src/imports/controls/ApplicationWindow.qml +++ b/src/imports/controls/ApplicationWindow.qml @@ -3,7 +3,7 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. +** This file is part of the Qt Labs Controls module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -36,7 +36,7 @@ import QtQuick 2.6 import QtQuick.Window 2.2 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 import Qt.labs.templates 1.0 as T T.ApplicationWindow { diff --git a/src/imports/controls/BusyIndicator.qml b/src/imports/controls/BusyIndicator.qml index e9a57931..60c8df54 100644 --- a/src/imports/controls/BusyIndicator.qml +++ b/src/imports/controls/BusyIndicator.qml @@ -3,7 +3,7 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. +** This file is part of the Qt Labs Controls module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 import Qt.labs.templates 1.0 as T T.BusyIndicator { diff --git a/src/imports/controls/Button.qml b/src/imports/controls/Button.qml index f475ffe9..ae5f446c 100644 --- a/src/imports/controls/Button.qml +++ b/src/imports/controls/Button.qml @@ -3,7 +3,7 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. +** This file is part of the Qt Labs Controls module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 import Qt.labs.templates 1.0 as T T.Button { diff --git a/src/imports/controls/CheckBox.qml b/src/imports/controls/CheckBox.qml index ae851ce9..a24e73ae 100644 --- a/src/imports/controls/CheckBox.qml +++ b/src/imports/controls/CheckBox.qml @@ -3,7 +3,7 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. +** This file is part of the Qt Labs Controls module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 import Qt.labs.templates 1.0 as T T.CheckBox { diff --git a/src/imports/controls/Dial.qml b/src/imports/controls/Dial.qml index 312ac4dc..378a9339 100644 --- a/src/imports/controls/Dial.qml +++ b/src/imports/controls/Dial.qml @@ -3,7 +3,7 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. +** This file is part of the Qt Labs Controls module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 import Qt.labs.templates 1.0 as T T.Dial { diff --git a/src/imports/controls/Drawer.qml b/src/imports/controls/Drawer.qml index 85f38163..5cf0994a 100644 --- a/src/imports/controls/Drawer.qml +++ b/src/imports/controls/Drawer.qml @@ -3,7 +3,7 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. +** This file is part of the Qt Labs Controls module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 import Qt.labs.templates 1.0 as T T.Drawer { diff --git a/src/imports/controls/Frame.qml b/src/imports/controls/Frame.qml index fe59e908..2d72acb5 100644 --- a/src/imports/controls/Frame.qml +++ b/src/imports/controls/Frame.qml @@ -3,7 +3,7 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. +** This file is part of the Qt Labs Controls module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 import Qt.labs.templates 1.0 as T T.Frame { diff --git a/src/imports/controls/GroupBox.qml b/src/imports/controls/GroupBox.qml index d178d86b..c7e93c63 100644 --- a/src/imports/controls/GroupBox.qml +++ b/src/imports/controls/GroupBox.qml @@ -3,7 +3,7 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. +** This file is part of the Qt Labs Controls module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 import Qt.labs.templates 1.0 as T T.GroupBox { diff --git a/src/imports/controls/Label.qml b/src/imports/controls/Label.qml index 2098e74b..82b2c629 100644 --- a/src/imports/controls/Label.qml +++ b/src/imports/controls/Label.qml @@ -3,7 +3,7 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. +** This file is part of the Qt Labs Controls module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 import Qt.labs.templates 1.0 as T T.Label { diff --git a/src/imports/controls/PageIndicator.qml b/src/imports/controls/PageIndicator.qml index 86b4356f..445c51d3 100644 --- a/src/imports/controls/PageIndicator.qml +++ b/src/imports/controls/PageIndicator.qml @@ -3,7 +3,7 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. +** This file is part of the Qt Labs Controls module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 import Qt.labs.templates 1.0 as T T.PageIndicator { diff --git a/src/imports/controls/ProgressBar.qml b/src/imports/controls/ProgressBar.qml index c496dab7..6fb5f515 100644 --- a/src/imports/controls/ProgressBar.qml +++ b/src/imports/controls/ProgressBar.qml @@ -3,7 +3,7 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. +** This file is part of the Qt Labs Controls module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 import Qt.labs.templates 1.0 as T T.ProgressBar { diff --git a/src/imports/controls/RadioButton.qml b/src/imports/controls/RadioButton.qml index 197c05b3..0c4d0edd 100644 --- a/src/imports/controls/RadioButton.qml +++ b/src/imports/controls/RadioButton.qml @@ -3,7 +3,7 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. +** This file is part of the Qt Labs Controls module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 import Qt.labs.templates 1.0 as T T.RadioButton { diff --git a/src/imports/controls/ScrollBar.qml b/src/imports/controls/ScrollBar.qml index 8b22b0c2..d1a45a71 100644 --- a/src/imports/controls/ScrollBar.qml +++ b/src/imports/controls/ScrollBar.qml @@ -3,7 +3,7 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. +** This file is part of the Qt Labs Controls module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 import Qt.labs.templates 1.0 as T T.ScrollBar { diff --git a/src/imports/controls/ScrollIndicator.qml b/src/imports/controls/ScrollIndicator.qml index 87bb8872..8c4fc1d5 100644 --- a/src/imports/controls/ScrollIndicator.qml +++ b/src/imports/controls/ScrollIndicator.qml @@ -3,7 +3,7 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. +** This file is part of the Qt Labs Controls module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 import Qt.labs.templates 1.0 as T T.ScrollIndicator { diff --git a/src/imports/controls/Slider.qml b/src/imports/controls/Slider.qml index 6a53ab64..c1309d5a 100644 --- a/src/imports/controls/Slider.qml +++ b/src/imports/controls/Slider.qml @@ -3,7 +3,7 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. +** This file is part of the Qt Labs Controls module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 import Qt.labs.templates 1.0 as T T.Slider { diff --git a/src/imports/controls/StackView.qml b/src/imports/controls/StackView.qml index 99b1b871..1288f8a4 100644 --- a/src/imports/controls/StackView.qml +++ b/src/imports/controls/StackView.qml @@ -3,7 +3,7 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. +** This file is part of the Qt Labs Controls module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.4 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 import Qt.labs.templates 1.0 as T T.StackView { diff --git a/src/imports/controls/SwipeView.qml b/src/imports/controls/SwipeView.qml index ad5504a8..52248961 100644 --- a/src/imports/controls/SwipeView.qml +++ b/src/imports/controls/SwipeView.qml @@ -3,7 +3,7 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. +** This file is part of the Qt Labs Controls module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 import Qt.labs.templates 1.0 as T T.SwipeView { diff --git a/src/imports/controls/Switch.qml b/src/imports/controls/Switch.qml index 75925d8a..2768c2c7 100644 --- a/src/imports/controls/Switch.qml +++ b/src/imports/controls/Switch.qml @@ -3,7 +3,7 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. +** This file is part of the Qt Labs Controls module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 import Qt.labs.templates 1.0 as T T.Switch { diff --git a/src/imports/controls/TabBar.qml b/src/imports/controls/TabBar.qml index b0cfcf65..28d6a5db 100644 --- a/src/imports/controls/TabBar.qml +++ b/src/imports/controls/TabBar.qml @@ -3,7 +3,7 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. +** This file is part of the Qt Labs Controls module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 import Qt.labs.templates 1.0 as T T.TabBar { diff --git a/src/imports/controls/TabButton.qml b/src/imports/controls/TabButton.qml index 9a6a75ca..8bd05114 100644 --- a/src/imports/controls/TabButton.qml +++ b/src/imports/controls/TabButton.qml @@ -3,7 +3,7 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. +** This file is part of the Qt Labs Controls module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 import Qt.labs.templates 1.0 as T T.TabButton { diff --git a/src/imports/controls/TextArea.qml b/src/imports/controls/TextArea.qml index fbdbc482..e6a50336 100644 --- a/src/imports/controls/TextArea.qml +++ b/src/imports/controls/TextArea.qml @@ -3,7 +3,7 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. +** This file is part of the Qt Labs Controls module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 import Qt.labs.templates 1.0 as T T.TextArea { diff --git a/src/imports/controls/TextField.qml b/src/imports/controls/TextField.qml index 19f19b24..7a00591f 100644 --- a/src/imports/controls/TextField.qml +++ b/src/imports/controls/TextField.qml @@ -3,7 +3,7 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. +** This file is part of the Qt Labs Controls module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 import Qt.labs.templates 1.0 as T T.TextField { diff --git a/src/imports/controls/ToolBar.qml b/src/imports/controls/ToolBar.qml index 577a7b8f..be1b5d7a 100644 --- a/src/imports/controls/ToolBar.qml +++ b/src/imports/controls/ToolBar.qml @@ -3,7 +3,7 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. +** This file is part of the Qt Labs Controls module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 import Qt.labs.templates 1.0 as T T.ToolBar { diff --git a/src/imports/controls/ToolButton.qml b/src/imports/controls/ToolButton.qml index 7fd41ec7..06fdd763 100644 --- a/src/imports/controls/ToolButton.qml +++ b/src/imports/controls/ToolButton.qml @@ -3,7 +3,7 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. +** This file is part of the Qt Labs Controls module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 import Qt.labs.templates 1.0 as T T.ToolButton { diff --git a/src/imports/controls/Tumbler.qml b/src/imports/controls/Tumbler.qml index 940130fb..51230e98 100644 --- a/src/imports/controls/Tumbler.qml +++ b/src/imports/controls/Tumbler.qml @@ -3,7 +3,7 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. +** This file is part of the Qt Labs Controls module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 import Qt.labs.templates 1.0 as T T.Tumbler { diff --git a/src/imports/controls/controls.pro b/src/imports/controls/controls.pro index b03aeb08..14e085dd 100644 --- a/src/imports/controls/controls.pro +++ b/src/imports/controls/controls.pro @@ -1,20 +1,20 @@ -TARGET = qtquickcontrols2plugin -TARGETPATH = QtQuick/Controls.2 -IMPORT_VERSION = 2.0 +TARGET = qtlabscontrolsplugin +TARGETPATH = Qt/labs/controls +IMPORT_VERSION = 1.0 QT += qml quick QT += core-private gui-private qml-private quick-private labstemplates-private -QMAKE_DOCS = $$PWD/doc/qtquickcontrols2.qdocconf +QMAKE_DOCS = $$PWD/doc/qtlabscontrols.qdocconf OTHER_FILES += \ qmldir SOURCES += \ - $$PWD/qtquickcontrols2plugin.cpp + $$PWD/qtlabscontrolsplugin.cpp RESOURCES += \ - $$PWD/qtquickcontrols2plugin.qrc + $$PWD/qtlabscontrolsplugin.qrc OTHER_FILES += \ $$PWD/theme.json diff --git a/src/imports/controls/designer/BusyIndicatorSpecifics.qml b/src/imports/controls/designer/BusyIndicatorSpecifics.qml index 6cdc22f9..679377f4 100644 --- a/src/imports/controls/designer/BusyIndicatorSpecifics.qml +++ b/src/imports/controls/designer/BusyIndicatorSpecifics.qml @@ -3,7 +3,7 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. +** This file is part of the Qt Labs Controls module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage diff --git a/src/imports/controls/designer/ButtonSpecifics.qml b/src/imports/controls/designer/ButtonSpecifics.qml index ee3324e0..2014abf0 100644 --- a/src/imports/controls/designer/ButtonSpecifics.qml +++ b/src/imports/controls/designer/ButtonSpecifics.qml @@ -3,7 +3,7 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. +** This file is part of the Qt Labs Controls module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage diff --git a/src/imports/controls/designer/CheckBoxSpecifics.qml b/src/imports/controls/designer/CheckBoxSpecifics.qml index 7d8c18cf..3082d1f1 100644 --- a/src/imports/controls/designer/CheckBoxSpecifics.qml +++ b/src/imports/controls/designer/CheckBoxSpecifics.qml @@ -3,7 +3,7 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. +** This file is part of the Qt Labs Controls module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage diff --git a/src/imports/controls/designer/ControlSection.qml b/src/imports/controls/designer/ControlSection.qml index 441bd16f..e026d620 100644 --- a/src/imports/controls/designer/ControlSection.qml +++ b/src/imports/controls/designer/ControlSection.qml @@ -3,7 +3,7 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. +** This file is part of the Qt Labs Controls module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage diff --git a/src/imports/controls/designer/ControlSpecifics.qml b/src/imports/controls/designer/ControlSpecifics.qml index 6eb68d87..80e01cf2 100644 --- a/src/imports/controls/designer/ControlSpecifics.qml +++ b/src/imports/controls/designer/ControlSpecifics.qml @@ -3,7 +3,7 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. +** This file is part of the Qt Labs Controls module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage diff --git a/src/imports/controls/designer/FrameSpecifics.qml b/src/imports/controls/designer/FrameSpecifics.qml index 6eb68d87..80e01cf2 100644 --- a/src/imports/controls/designer/FrameSpecifics.qml +++ b/src/imports/controls/designer/FrameSpecifics.qml @@ -3,7 +3,7 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. +** This file is part of the Qt Labs Controls module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage diff --git a/src/imports/controls/designer/GroupBoxSpecifics.qml b/src/imports/controls/designer/GroupBoxSpecifics.qml index 16f705f9..6e70adfa 100644 --- a/src/imports/controls/designer/GroupBoxSpecifics.qml +++ b/src/imports/controls/designer/GroupBoxSpecifics.qml @@ -3,7 +3,7 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. +** This file is part of the Qt Labs Controls module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage diff --git a/src/imports/controls/designer/LabelSpecifics.qml b/src/imports/controls/designer/LabelSpecifics.qml index 50661185..adee2fac 100644 --- a/src/imports/controls/designer/LabelSpecifics.qml +++ b/src/imports/controls/designer/LabelSpecifics.qml @@ -3,7 +3,7 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. +** This file is part of the Qt Labs Controls module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage diff --git a/src/imports/controls/designer/PaddingSection.qml b/src/imports/controls/designer/PaddingSection.qml index 8a83e277..b2c9feb9 100644 --- a/src/imports/controls/designer/PaddingSection.qml +++ b/src/imports/controls/designer/PaddingSection.qml @@ -3,7 +3,7 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. +** This file is part of the Qt Labs Controls module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage diff --git a/src/imports/controls/designer/PageIndicatorSpecifics.qml b/src/imports/controls/designer/PageIndicatorSpecifics.qml index cd07354c..0c2e4638 100644 --- a/src/imports/controls/designer/PageIndicatorSpecifics.qml +++ b/src/imports/controls/designer/PageIndicatorSpecifics.qml @@ -3,7 +3,7 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. +** This file is part of the Qt Labs Controls module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage diff --git a/src/imports/controls/designer/ProgressBarSpecifics.qml b/src/imports/controls/designer/ProgressBarSpecifics.qml index 9c4cc3ab..a5ad9809 100644 --- a/src/imports/controls/designer/ProgressBarSpecifics.qml +++ b/src/imports/controls/designer/ProgressBarSpecifics.qml @@ -3,7 +3,7 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. +** This file is part of the Qt Labs Controls module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage diff --git a/src/imports/controls/designer/RadioButtonSpecifics.qml b/src/imports/controls/designer/RadioButtonSpecifics.qml index 98da1a91..285b660a 100644 --- a/src/imports/controls/designer/RadioButtonSpecifics.qml +++ b/src/imports/controls/designer/RadioButtonSpecifics.qml @@ -3,7 +3,7 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. +** This file is part of the Qt Labs Controls module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage diff --git a/src/imports/controls/designer/SliderSpecifics.qml b/src/imports/controls/designer/SliderSpecifics.qml index 814037bf..535ae830 100644 --- a/src/imports/controls/designer/SliderSpecifics.qml +++ b/src/imports/controls/designer/SliderSpecifics.qml @@ -3,7 +3,7 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. +** This file is part of the Qt Labs Controls module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage diff --git a/src/imports/controls/designer/SwitchSpecifics.qml b/src/imports/controls/designer/SwitchSpecifics.qml index 7b632eb6..63fdb4bf 100644 --- a/src/imports/controls/designer/SwitchSpecifics.qml +++ b/src/imports/controls/designer/SwitchSpecifics.qml @@ -3,7 +3,7 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. +** This file is part of the Qt Labs Controls module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage diff --git a/src/imports/controls/designer/TextAreaSpecifics.qml b/src/imports/controls/designer/TextAreaSpecifics.qml index 50661185..adee2fac 100644 --- a/src/imports/controls/designer/TextAreaSpecifics.qml +++ b/src/imports/controls/designer/TextAreaSpecifics.qml @@ -3,7 +3,7 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. +** This file is part of the Qt Labs Controls module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage diff --git a/src/imports/controls/designer/TextFieldSpecifics.qml b/src/imports/controls/designer/TextFieldSpecifics.qml index 950afdf8..ab3e2b5e 100644 --- a/src/imports/controls/designer/TextFieldSpecifics.qml +++ b/src/imports/controls/designer/TextFieldSpecifics.qml @@ -3,7 +3,7 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. +** This file is part of the Qt Labs Controls module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage diff --git a/src/imports/controls/designer/ToolBarSpecifics.qml b/src/imports/controls/designer/ToolBarSpecifics.qml index 6eb68d87..80e01cf2 100644 --- a/src/imports/controls/designer/ToolBarSpecifics.qml +++ b/src/imports/controls/designer/ToolBarSpecifics.qml @@ -3,7 +3,7 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. +** This file is part of the Qt Labs Controls module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage diff --git a/src/imports/controls/designer/ToolButtonSpecifics.qml b/src/imports/controls/designer/ToolButtonSpecifics.qml index 860b8582..fab18b5b 100644 --- a/src/imports/controls/designer/ToolButtonSpecifics.qml +++ b/src/imports/controls/designer/ToolButtonSpecifics.qml @@ -3,7 +3,7 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. +** This file is part of the Qt Labs Controls module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage diff --git a/src/imports/controls/designer/designer.pri b/src/imports/controls/designer/designer.pri index 8a14bc69..9b7847b1 100644 --- a/src/imports/controls/designer/designer.pri +++ b/src/imports/controls/designer/designer.pri @@ -1,5 +1,5 @@ QML_FILES += \ - $$PWD/qtquickcontrols2.metainfo + $$PWD/qtlabscontrols.metainfo QML_FILES += \ $$PWD/BusyIndicatorSpecifics.qml \ diff --git a/src/imports/controls/designer/qtlabscontrols.metainfo b/src/imports/controls/designer/qtlabscontrols.metainfo new file mode 100644 index 00000000..0d82159b --- /dev/null +++ b/src/imports/controls/designer/qtlabscontrols.metainfo @@ -0,0 +1,227 @@ +MetaInfo { + Type { + name: "Qt.labs.controls.BusyIndicator" + icon: "images/todo16.png" + + ItemLibraryEntry { + name: "Busy Indicator" + category: "Qt Labs - Controls" + libraryIcon: "images/todo.png" + version: "2.0" + requiredImport: "Qt.labs.controls" + } + } + + Type { + name: "Qt.labs.controls.Button" + icon: "images/todo16.png" + + ItemLibraryEntry { + name: "Button" + category: "Qt Labs - Controls" + libraryIcon: "images/todo.png" + version: "2.0" + requiredImport: "Qt.labs.controls" + + Property { name: "text"; type: "binding"; value: "qsTr('Button')" } + } + } + + Type { + name: "Qt.labs.controls.CheckBox" + icon: "images/todo16.png" + + ItemLibraryEntry { + name: "Check Box" + category: "Qt Labs - Controls" + libraryIcon: "images/todo.png" + version: "2.0" + requiredImport: "Qt.labs.controls" + + Property { name: "text"; type: "binding"; value: "qsTr('Check Box')" } + } + } + + Type { + name: "Qt.labs.controls.Frame" + icon: "images/todo16.png" + + ItemLibraryEntry { + name: "Frame" + category: "Qt Labs - Controls" + libraryIcon: "images/todo.png" + version: "2.0" + requiredImport: "Qt.labs.controls" + + Property { name: "width"; type: "int"; value: 200 } + Property { name: "height"; type: "int"; value: 200 } + } + } + + Type { + name: "Qt.labs.controls.GroupBox" + icon: "images/todo16.png" + + ItemLibraryEntry { + name: "Group Box" + category: "Qt Labs - Controls" + libraryIcon: "images/todo.png" + version: "2.0" + requiredImport: "Qt.labs.controls" + + Property { name: "width"; type: "int"; value: 200 } + Property { name: "height"; type: "int"; value: 200 } + Property { name: "title"; type: "binding"; value: "qsTr('Group Box')" } + } + } + + Type { + name: "Qt.labs.controls.Label" + icon: "images/todo16.png" + + ItemLibraryEntry { + name: "Label" + category: "Qt Labs - Controls" + libraryIcon: "images/todo.png" + version: "2.0" + requiredImport: "Qt.labs.controls" + + Property { name: "text"; type: "binding"; value: "qsTr('Label')" } + } + } + + Type { + name: "Qt.labs.controls.PageIndicator" + icon: "images/todo16.png" + + ItemLibraryEntry { + name: "Page Indicator" + category: "Qt Labs - Controls" + libraryIcon: "images/todo.png" + version: "2.0" + requiredImport: "Qt.labs.controls" + + Property { name: "count"; type: "int"; value: 3 } + } + } + + Type { + name: "Qt.labs.controls.ProgressBar" + icon: "images/todo16.png" + + ItemLibraryEntry { + name: "Progress Bar" + category: "Qt Labs - Controls" + libraryIcon: "images/todo.png" + version: "2.0" + requiredImport: "Qt.labs.controls" + + Property { name: "value"; type: "real"; value: 0.5 } + } + } + + Type { + name: "Qt.labs.controls.RadioButton" + icon: "images/todo16.png" + + ItemLibraryEntry { + name: "Radio Button" + category: "Qt Labs - Controls" + libraryIcon: "images/todo.png" + version: "2.0" + requiredImport: "Qt.labs.controls" + + Property { name: "text"; type: "binding"; value: "qsTr('Radio Button')" } + } + } + + Type { + name: "Qt.labs.controls.Slider" + icon: "images/todo16.png" + + ItemLibraryEntry { + name: "Slider" + category: "Qt Labs - Controls" + libraryIcon: "images/todo.png" + version: "2.0" + requiredImport: "Qt.labs.controls" + + Property { name: "value"; type: "real"; value: 0.5 } + } + } + + Type { + name: "Qt.labs.controls.Switch" + icon: "images/todo16.png" + + ItemLibraryEntry { + name: "Switch" + category: "Qt Labs - Controls" + libraryIcon: "images/todo.png" + version: "2.0" + requiredImport: "Qt.labs.controls" + + Property { name: "text"; type: "binding"; value: "qsTr('Switch')" } + } + } + + Type { + name: "Qt.labs.controls.TextArea" + icon: "images/todo16.png" + + ItemLibraryEntry { + name: "Text Area" + category: "Qt Labs - Controls" + libraryIcon: "images/todo.png" + version: "2.0" + requiredImport: "Qt.labs.controls" + + Property { name: "text"; type: "binding"; value: "qsTr('Text Area')" } + } + } + + Type { + name: "Qt.labs.controls.TextField" + icon: "images/todo16.png" + + ItemLibraryEntry { + name: "Text Field" + category: "Qt Labs - Controls" + libraryIcon: "images/todo.png" + version: "2.0" + requiredImport: "Qt.labs.controls" + + Property { name: "text"; type: "binding"; value: "qsTr('Text Field')" } + } + } + + Type { + name: "Qt.labs.controls.ToolButton" + icon: "images/todo16.png" + + ItemLibraryEntry { + name: "Tool Button" + category: "Qt Labs - Controls" + libraryIcon: "images/todo.png" + version: "2.0" + requiredImport: "Qt.labs.controls" + + Property { name: "text"; type: "binding"; value: "qsTr('Tool Button')" } + } + } + + Type { + name: "Qt.labs.controls.ToolBar" + icon: "images/todo16.png" + + ItemLibraryEntry { + name: "Tool Bar" + category: "Qt Labs - Controls" + libraryIcon: "images/todo.png" + version: "2.0" + requiredImport: "Qt.labs.controls" + + Property { name: "width"; type: "int"; value: 360 } + } + } +} diff --git a/src/imports/controls/designer/qtquickcontrols2.metainfo b/src/imports/controls/designer/qtquickcontrols2.metainfo deleted file mode 100644 index 40439833..00000000 --- a/src/imports/controls/designer/qtquickcontrols2.metainfo +++ /dev/null @@ -1,227 +0,0 @@ -MetaInfo { - Type { - name: "QtQuick.Controls.BusyIndicator" - icon: "images/todo16.png" - - ItemLibraryEntry { - name: "Busy Indicator" - category: "Qt Quick - Controls" - libraryIcon: "images/todo.png" - version: "2.0" - requiredImport: "QtQuick.Controls" - } - } - - Type { - name: "QtQuick.Controls.Button" - icon: "images/todo16.png" - - ItemLibraryEntry { - name: "Button" - category: "Qt Quick - Controls" - libraryIcon: "images/todo.png" - version: "2.0" - requiredImport: "QtQuick.Controls" - - Property { name: "text"; type: "binding"; value: "qsTr('Button')" } - } - } - - Type { - name: "QtQuick.Controls.CheckBox" - icon: "images/todo16.png" - - ItemLibraryEntry { - name: "Check Box" - category: "Qt Quick - Controls" - libraryIcon: "images/todo.png" - version: "2.0" - requiredImport: "QtQuick.Controls" - - Property { name: "text"; type: "binding"; value: "qsTr('Check Box')" } - } - } - - Type { - name: "QtQuick.Controls.Frame" - icon: "images/todo16.png" - - ItemLibraryEntry { - name: "Frame" - category: "Qt Quick - Controls" - libraryIcon: "images/todo.png" - version: "2.0" - requiredImport: "QtQuick.Controls" - - Property { name: "width"; type: "int"; value: 200 } - Property { name: "height"; type: "int"; value: 200 } - } - } - - Type { - name: "QtQuick.Controls.GroupBox" - icon: "images/todo16.png" - - ItemLibraryEntry { - name: "Group Box" - category: "Qt Quick - Controls" - libraryIcon: "images/todo.png" - version: "2.0" - requiredImport: "QtQuick.Controls" - - Property { name: "width"; type: "int"; value: 200 } - Property { name: "height"; type: "int"; value: 200 } - Property { name: "title"; type: "binding"; value: "qsTr('Group Box')" } - } - } - - Type { - name: "QtQuick.Controls.Label" - icon: "images/todo16.png" - - ItemLibraryEntry { - name: "Label" - category: "Qt Quick - Controls" - libraryIcon: "images/todo.png" - version: "2.0" - requiredImport: "QtQuick.Controls" - - Property { name: "text"; type: "binding"; value: "qsTr('Label')" } - } - } - - Type { - name: "QtQuick.Controls.PageIndicator" - icon: "images/todo16.png" - - ItemLibraryEntry { - name: "Page Indicator" - category: "Qt Quick - Controls" - libraryIcon: "images/todo.png" - version: "2.0" - requiredImport: "QtQuick.Controls" - - Property { name: "count"; type: "int"; value: 3 } - } - } - - Type { - name: "QtQuick.Controls.ProgressBar" - icon: "images/todo16.png" - - ItemLibraryEntry { - name: "Progress Bar" - category: "Qt Quick - Controls" - libraryIcon: "images/todo.png" - version: "2.0" - requiredImport: "QtQuick.Controls" - - Property { name: "value"; type: "real"; value: 0.5 } - } - } - - Type { - name: "QtQuick.Controls.RadioButton" - icon: "images/todo16.png" - - ItemLibraryEntry { - name: "Radio Button" - category: "Qt Quick - Controls" - libraryIcon: "images/todo.png" - version: "2.0" - requiredImport: "QtQuick.Controls" - - Property { name: "text"; type: "binding"; value: "qsTr('Radio Button')" } - } - } - - Type { - name: "QtQuick.Controls.Slider" - icon: "images/todo16.png" - - ItemLibraryEntry { - name: "Slider" - category: "Qt Quick - Controls" - libraryIcon: "images/todo.png" - version: "2.0" - requiredImport: "QtQuick.Controls" - - Property { name: "value"; type: "real"; value: 0.5 } - } - } - - Type { - name: "QtQuick.Controls.Switch" - icon: "images/todo16.png" - - ItemLibraryEntry { - name: "Switch" - category: "Qt Quick - Controls" - libraryIcon: "images/todo.png" - version: "2.0" - requiredImport: "QtQuick.Controls" - - Property { name: "text"; type: "binding"; value: "qsTr('Switch')" } - } - } - - Type { - name: "QtQuick.Controls.TextArea" - icon: "images/todo16.png" - - ItemLibraryEntry { - name: "Text Area" - category: "Qt Quick - Controls" - libraryIcon: "images/todo.png" - version: "2.0" - requiredImport: "QtQuick.Controls" - - Property { name: "text"; type: "binding"; value: "qsTr('Text Area')" } - } - } - - Type { - name: "QtQuick.Controls.TextField" - icon: "images/todo16.png" - - ItemLibraryEntry { - name: "Text Field" - category: "Qt Quick - Controls" - libraryIcon: "images/todo.png" - version: "2.0" - requiredImport: "QtQuick.Controls" - - Property { name: "text"; type: "binding"; value: "qsTr('Text Field')" } - } - } - - Type { - name: "QtQuick.Controls.ToolButton" - icon: "images/todo16.png" - - ItemLibraryEntry { - name: "Tool Button" - category: "Qt Quick - Controls" - libraryIcon: "images/todo.png" - version: "2.0" - requiredImport: "QtQuick.Controls" - - Property { name: "text"; type: "binding"; value: "qsTr('Tool Button')" } - } - } - - Type { - name: "QtQuick.Controls.ToolBar" - icon: "images/todo16.png" - - ItemLibraryEntry { - name: "Tool Bar" - category: "Qt Quick - Controls" - libraryIcon: "images/todo.png" - version: "2.0" - requiredImport: "QtQuick.Controls" - - Property { name: "width"; type: "int"; value: 360 } - } - } -} diff --git a/src/imports/controls/doc/images/qtlabscontrols-busyindicator-background.png b/src/imports/controls/doc/images/qtlabscontrols-busyindicator-background.png new file mode 100644 index 00000000..84cd2ed9 Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-busyindicator-background.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-busyindicator-indicator.png b/src/imports/controls/doc/images/qtlabscontrols-busyindicator-indicator.png new file mode 100644 index 00000000..87db05a1 Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-busyindicator-indicator.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-busyindicator.gif b/src/imports/controls/doc/images/qtlabscontrols-busyindicator.gif new file mode 100644 index 00000000..46633c34 Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-busyindicator.gif differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-button-background.png b/src/imports/controls/doc/images/qtlabscontrols-button-background.png new file mode 100644 index 00000000..f8e9342c Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-button-background.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-button-disabled.png b/src/imports/controls/doc/images/qtlabscontrols-button-disabled.png new file mode 100644 index 00000000..9b9d1eb3 Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-button-disabled.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-button-focused.png b/src/imports/controls/doc/images/qtlabscontrols-button-focused.png new file mode 100644 index 00000000..172bf9fe Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-button-focused.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-button-label.png b/src/imports/controls/doc/images/qtlabscontrols-button-label.png new file mode 100644 index 00000000..6875fc06 Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-button-label.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-button-normal.png b/src/imports/controls/doc/images/qtlabscontrols-button-normal.png new file mode 100644 index 00000000..f59669a2 Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-button-normal.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-button-pressed.png b/src/imports/controls/doc/images/qtlabscontrols-button-pressed.png new file mode 100644 index 00000000..c9b14992 Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-button-pressed.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-button.gif b/src/imports/controls/doc/images/qtlabscontrols-button.gif new file mode 100644 index 00000000..9f08f458 Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-button.gif differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-checkbox-background.png b/src/imports/controls/doc/images/qtlabscontrols-checkbox-background.png new file mode 100644 index 00000000..81198821 Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-checkbox-background.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-checkbox-checked.png b/src/imports/controls/doc/images/qtlabscontrols-checkbox-checked.png new file mode 100644 index 00000000..f44428e0 Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-checkbox-checked.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-checkbox-disabled.png b/src/imports/controls/doc/images/qtlabscontrols-checkbox-disabled.png new file mode 100644 index 00000000..ca31061a Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-checkbox-disabled.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-checkbox-focused.png b/src/imports/controls/doc/images/qtlabscontrols-checkbox-focused.png new file mode 100644 index 00000000..7847fb9b Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-checkbox-focused.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-checkbox-indicator.png b/src/imports/controls/doc/images/qtlabscontrols-checkbox-indicator.png new file mode 100644 index 00000000..7c6148b6 Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-checkbox-indicator.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-checkbox-label.png b/src/imports/controls/doc/images/qtlabscontrols-checkbox-label.png new file mode 100644 index 00000000..5bef6df5 Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-checkbox-label.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-checkbox-normal.png b/src/imports/controls/doc/images/qtlabscontrols-checkbox-normal.png new file mode 100644 index 00000000..790ebc93 Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-checkbox-normal.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-dial-background.png b/src/imports/controls/doc/images/qtlabscontrols-dial-background.png new file mode 100644 index 00000000..38fad583 Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-dial-background.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-dial-handle.png b/src/imports/controls/doc/images/qtlabscontrols-dial-handle.png new file mode 100644 index 00000000..e6fd8cdc Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-dial-handle.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-frame-background.png b/src/imports/controls/doc/images/qtlabscontrols-frame-background.png new file mode 100644 index 00000000..e09960fc Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-frame-background.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-frame-frame.png b/src/imports/controls/doc/images/qtlabscontrols-frame-frame.png new file mode 100644 index 00000000..bfdf9c1b Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-frame-frame.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-groupbox-background.png b/src/imports/controls/doc/images/qtlabscontrols-groupbox-background.png new file mode 100644 index 00000000..36e9aa0f Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-groupbox-background.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-groupbox-frame.png b/src/imports/controls/doc/images/qtlabscontrols-groupbox-frame.png new file mode 100644 index 00000000..11b075d7 Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-groupbox-frame.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-groupbox-label.png b/src/imports/controls/doc/images/qtlabscontrols-groupbox-label.png new file mode 100644 index 00000000..67ccb4c1 Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-groupbox-label.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-progressbar-background.png b/src/imports/controls/doc/images/qtlabscontrols-progressbar-background.png new file mode 100644 index 00000000..0fd77835 Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-progressbar-background.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-progressbar-disabled.png b/src/imports/controls/doc/images/qtlabscontrols-progressbar-disabled.png new file mode 100644 index 00000000..4baf5c83 Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-progressbar-disabled.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-progressbar-indicator.png b/src/imports/controls/doc/images/qtlabscontrols-progressbar-indicator.png new file mode 100644 index 00000000..02e888ed Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-progressbar-indicator.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-progressbar-normal.png b/src/imports/controls/doc/images/qtlabscontrols-progressbar-normal.png new file mode 100644 index 00000000..783d721d Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-progressbar-normal.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-radiobutton-background.png b/src/imports/controls/doc/images/qtlabscontrols-radiobutton-background.png new file mode 100644 index 00000000..3ee9590e Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-radiobutton-background.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-radiobutton-checked.png b/src/imports/controls/doc/images/qtlabscontrols-radiobutton-checked.png new file mode 100644 index 00000000..9f71b6b6 Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-radiobutton-checked.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-radiobutton-disabled.png b/src/imports/controls/doc/images/qtlabscontrols-radiobutton-disabled.png new file mode 100644 index 00000000..f7fbcb7c Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-radiobutton-disabled.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-radiobutton-focused.png b/src/imports/controls/doc/images/qtlabscontrols-radiobutton-focused.png new file mode 100644 index 00000000..dfb8d51e Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-radiobutton-focused.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-radiobutton-indicator.png b/src/imports/controls/doc/images/qtlabscontrols-radiobutton-indicator.png new file mode 100644 index 00000000..f9e91709 Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-radiobutton-indicator.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-radiobutton-label.png b/src/imports/controls/doc/images/qtlabscontrols-radiobutton-label.png new file mode 100644 index 00000000..16c0ee08 Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-radiobutton-label.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-radiobutton-normal.png b/src/imports/controls/doc/images/qtlabscontrols-radiobutton-normal.png new file mode 100644 index 00000000..5a2d4bca Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-radiobutton-normal.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-scrollbar-background.png b/src/imports/controls/doc/images/qtlabscontrols-scrollbar-background.png new file mode 100644 index 00000000..770f546c Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-scrollbar-background.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-scrollbar-handle.png b/src/imports/controls/doc/images/qtlabscontrols-scrollbar-handle.png new file mode 100644 index 00000000..aafa90a7 Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-scrollbar-handle.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-scrollindicator-background.png b/src/imports/controls/doc/images/qtlabscontrols-scrollindicator-background.png new file mode 100644 index 00000000..e8947aa0 Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-scrollindicator-background.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-scrollindicator-indicator.png b/src/imports/controls/doc/images/qtlabscontrols-scrollindicator-indicator.png new file mode 100644 index 00000000..9d969f16 Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-scrollindicator-indicator.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-slider-background.png b/src/imports/controls/doc/images/qtlabscontrols-slider-background.png new file mode 100644 index 00000000..35fb12ca Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-slider-background.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-slider-disabled.png b/src/imports/controls/doc/images/qtlabscontrols-slider-disabled.png new file mode 100644 index 00000000..7d4584f8 Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-slider-disabled.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-slider-focused.png b/src/imports/controls/doc/images/qtlabscontrols-slider-focused.png new file mode 100644 index 00000000..7f9ad18b Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-slider-focused.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-slider-handle.png b/src/imports/controls/doc/images/qtlabscontrols-slider-handle.png new file mode 100644 index 00000000..7878e0f8 Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-slider-handle.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-slider-normal.png b/src/imports/controls/doc/images/qtlabscontrols-slider-normal.png new file mode 100644 index 00000000..dac102de Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-slider-normal.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-slider-track.png b/src/imports/controls/doc/images/qtlabscontrols-slider-track.png new file mode 100644 index 00000000..868fa420 Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-slider-track.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-slider.gif b/src/imports/controls/doc/images/qtlabscontrols-slider.gif new file mode 100644 index 00000000..59c94796 Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-slider.gif differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-switch-background.png b/src/imports/controls/doc/images/qtlabscontrols-switch-background.png new file mode 100644 index 00000000..bfa24fe6 Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-switch-background.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-switch-checked.png b/src/imports/controls/doc/images/qtlabscontrols-switch-checked.png new file mode 100644 index 00000000..fadf851a Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-switch-checked.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-switch-disabled.png b/src/imports/controls/doc/images/qtlabscontrols-switch-disabled.png new file mode 100644 index 00000000..328ff6a9 Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-switch-disabled.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-switch-focused.png b/src/imports/controls/doc/images/qtlabscontrols-switch-focused.png new file mode 100644 index 00000000..795868b8 Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-switch-focused.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-switch-indicator.png b/src/imports/controls/doc/images/qtlabscontrols-switch-indicator.png new file mode 100644 index 00000000..5fc9c83b Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-switch-indicator.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-switch-label.png b/src/imports/controls/doc/images/qtlabscontrols-switch-label.png new file mode 100644 index 00000000..57deabc6 Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-switch-label.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-switch-normal.png b/src/imports/controls/doc/images/qtlabscontrols-switch-normal.png new file mode 100644 index 00000000..a162e898 Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-switch-normal.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-switch.gif b/src/imports/controls/doc/images/qtlabscontrols-switch.gif new file mode 100644 index 00000000..b2e1b548 Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-switch.gif differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-textfield-background.png b/src/imports/controls/doc/images/qtlabscontrols-textfield-background.png new file mode 100644 index 00000000..a2908200 Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-textfield-background.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-textfield-disabled.png b/src/imports/controls/doc/images/qtlabscontrols-textfield-disabled.png new file mode 100644 index 00000000..bb5b779e Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-textfield-disabled.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-textfield-focused.png b/src/imports/controls/doc/images/qtlabscontrols-textfield-focused.png new file mode 100644 index 00000000..5d8592c1 Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-textfield-focused.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-textfield-normal.png b/src/imports/controls/doc/images/qtlabscontrols-textfield-normal.png new file mode 100644 index 00000000..26ad9c11 Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-textfield-normal.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-textfield-placeholder.png b/src/imports/controls/doc/images/qtlabscontrols-textfield-placeholder.png new file mode 100644 index 00000000..b040315f Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-textfield-placeholder.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-togglebutton-background.png b/src/imports/controls/doc/images/qtlabscontrols-togglebutton-background.png new file mode 100644 index 00000000..8f390b49 Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-togglebutton-background.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-togglebutton-checked.png b/src/imports/controls/doc/images/qtlabscontrols-togglebutton-checked.png new file mode 100644 index 00000000..fa883751 Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-togglebutton-checked.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-togglebutton-disabled.png b/src/imports/controls/doc/images/qtlabscontrols-togglebutton-disabled.png new file mode 100644 index 00000000..794692b0 Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-togglebutton-disabled.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-togglebutton-focused.png b/src/imports/controls/doc/images/qtlabscontrols-togglebutton-focused.png new file mode 100644 index 00000000..f52e4686 Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-togglebutton-focused.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-togglebutton-indicator.png b/src/imports/controls/doc/images/qtlabscontrols-togglebutton-indicator.png new file mode 100644 index 00000000..97e06e2c Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-togglebutton-indicator.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-togglebutton-label.png b/src/imports/controls/doc/images/qtlabscontrols-togglebutton-label.png new file mode 100644 index 00000000..3eb3ba35 Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-togglebutton-label.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-togglebutton-normal.png b/src/imports/controls/doc/images/qtlabscontrols-togglebutton-normal.png new file mode 100644 index 00000000..b066c565 Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-togglebutton-normal.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-toolbar-background.png b/src/imports/controls/doc/images/qtlabscontrols-toolbar-background.png new file mode 100644 index 00000000..28d4fd98 Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-toolbar-background.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-toolbar-frame.png b/src/imports/controls/doc/images/qtlabscontrols-toolbar-frame.png new file mode 100644 index 00000000..28d4fd98 Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-toolbar-frame.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-toolbutton-background.png b/src/imports/controls/doc/images/qtlabscontrols-toolbutton-background.png new file mode 100644 index 00000000..fd105fee Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-toolbutton-background.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-toolbutton-label.png b/src/imports/controls/doc/images/qtlabscontrols-toolbutton-label.png new file mode 100644 index 00000000..7aae8dc8 Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-toolbutton-label.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-tumbler-background.png b/src/imports/controls/doc/images/qtlabscontrols-tumbler-background.png new file mode 100644 index 00000000..aa736615 Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-tumbler-background.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-tumbler-contentItem.png b/src/imports/controls/doc/images/qtlabscontrols-tumbler-contentItem.png new file mode 100644 index 00000000..aa736615 Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-tumbler-contentItem.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-tumbler-delegate.png b/src/imports/controls/doc/images/qtlabscontrols-tumbler-delegate.png new file mode 100644 index 00000000..77c51efd Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-tumbler-delegate.png differ diff --git a/src/imports/controls/doc/images/qtlabscontrols-tumbler-wrap.gif b/src/imports/controls/doc/images/qtlabscontrols-tumbler-wrap.gif new file mode 100644 index 00000000..2a7e435d Binary files /dev/null and b/src/imports/controls/doc/images/qtlabscontrols-tumbler-wrap.gif differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-busyindicator-background.png b/src/imports/controls/doc/images/qtquickcontrols2-busyindicator-background.png deleted file mode 100644 index 84cd2ed9..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-busyindicator-background.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-busyindicator-indicator.png b/src/imports/controls/doc/images/qtquickcontrols2-busyindicator-indicator.png deleted file mode 100644 index 87db05a1..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-busyindicator-indicator.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-busyindicator.gif b/src/imports/controls/doc/images/qtquickcontrols2-busyindicator.gif deleted file mode 100644 index 46633c34..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-busyindicator.gif and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-button-background.png b/src/imports/controls/doc/images/qtquickcontrols2-button-background.png deleted file mode 100644 index f8e9342c..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-button-background.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-button-disabled.png b/src/imports/controls/doc/images/qtquickcontrols2-button-disabled.png deleted file mode 100644 index 9b9d1eb3..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-button-disabled.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-button-focused.png b/src/imports/controls/doc/images/qtquickcontrols2-button-focused.png deleted file mode 100644 index 172bf9fe..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-button-focused.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-button-label.png b/src/imports/controls/doc/images/qtquickcontrols2-button-label.png deleted file mode 100644 index 6875fc06..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-button-label.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-button-normal.png b/src/imports/controls/doc/images/qtquickcontrols2-button-normal.png deleted file mode 100644 index f59669a2..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-button-normal.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-button-pressed.png b/src/imports/controls/doc/images/qtquickcontrols2-button-pressed.png deleted file mode 100644 index c9b14992..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-button-pressed.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-button.gif b/src/imports/controls/doc/images/qtquickcontrols2-button.gif deleted file mode 100644 index 9f08f458..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-button.gif and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-background.png b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-background.png deleted file mode 100644 index 81198821..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-background.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-checked.png b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-checked.png deleted file mode 100644 index f44428e0..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-checked.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-disabled.png b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-disabled.png deleted file mode 100644 index ca31061a..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-disabled.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-focused.png b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-focused.png deleted file mode 100644 index 7847fb9b..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-focused.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-indicator.png b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-indicator.png deleted file mode 100644 index 7c6148b6..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-indicator.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-label.png b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-label.png deleted file mode 100644 index 5bef6df5..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-label.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-normal.png b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-normal.png deleted file mode 100644 index 790ebc93..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-normal.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-dial-background.png b/src/imports/controls/doc/images/qtquickcontrols2-dial-background.png deleted file mode 100644 index 38fad583..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-dial-background.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-dial-handle.png b/src/imports/controls/doc/images/qtquickcontrols2-dial-handle.png deleted file mode 100644 index e6fd8cdc..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-dial-handle.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-frame-background.png b/src/imports/controls/doc/images/qtquickcontrols2-frame-background.png deleted file mode 100644 index e09960fc..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-frame-background.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-frame-frame.png b/src/imports/controls/doc/images/qtquickcontrols2-frame-frame.png deleted file mode 100644 index bfdf9c1b..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-frame-frame.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-groupbox-background.png b/src/imports/controls/doc/images/qtquickcontrols2-groupbox-background.png deleted file mode 100644 index 36e9aa0f..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-groupbox-background.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-groupbox-frame.png b/src/imports/controls/doc/images/qtquickcontrols2-groupbox-frame.png deleted file mode 100644 index 11b075d7..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-groupbox-frame.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-groupbox-label.png b/src/imports/controls/doc/images/qtquickcontrols2-groupbox-label.png deleted file mode 100644 index 67ccb4c1..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-groupbox-label.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-progressbar-background.png b/src/imports/controls/doc/images/qtquickcontrols2-progressbar-background.png deleted file mode 100644 index 0fd77835..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-progressbar-background.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-progressbar-disabled.png b/src/imports/controls/doc/images/qtquickcontrols2-progressbar-disabled.png deleted file mode 100644 index 4baf5c83..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-progressbar-disabled.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-progressbar-indicator.png b/src/imports/controls/doc/images/qtquickcontrols2-progressbar-indicator.png deleted file mode 100644 index 02e888ed..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-progressbar-indicator.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-progressbar-normal.png b/src/imports/controls/doc/images/qtquickcontrols2-progressbar-normal.png deleted file mode 100644 index 783d721d..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-progressbar-normal.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-background.png b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-background.png deleted file mode 100644 index 3ee9590e..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-background.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-checked.png b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-checked.png deleted file mode 100644 index 9f71b6b6..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-checked.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-disabled.png b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-disabled.png deleted file mode 100644 index f7fbcb7c..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-disabled.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-focused.png b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-focused.png deleted file mode 100644 index dfb8d51e..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-focused.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-indicator.png b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-indicator.png deleted file mode 100644 index f9e91709..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-indicator.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-label.png b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-label.png deleted file mode 100644 index 16c0ee08..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-label.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-normal.png b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-normal.png deleted file mode 100644 index 5a2d4bca..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-normal.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-scrollbar-background.png b/src/imports/controls/doc/images/qtquickcontrols2-scrollbar-background.png deleted file mode 100644 index 770f546c..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-scrollbar-background.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-scrollbar-handle.png b/src/imports/controls/doc/images/qtquickcontrols2-scrollbar-handle.png deleted file mode 100644 index aafa90a7..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-scrollbar-handle.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-scrollindicator-background.png b/src/imports/controls/doc/images/qtquickcontrols2-scrollindicator-background.png deleted file mode 100644 index e8947aa0..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-scrollindicator-background.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-scrollindicator-indicator.png b/src/imports/controls/doc/images/qtquickcontrols2-scrollindicator-indicator.png deleted file mode 100644 index 9d969f16..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-scrollindicator-indicator.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-slider-background.png b/src/imports/controls/doc/images/qtquickcontrols2-slider-background.png deleted file mode 100644 index 35fb12ca..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-slider-background.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-slider-disabled.png b/src/imports/controls/doc/images/qtquickcontrols2-slider-disabled.png deleted file mode 100644 index 7d4584f8..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-slider-disabled.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-slider-focused.png b/src/imports/controls/doc/images/qtquickcontrols2-slider-focused.png deleted file mode 100644 index 7f9ad18b..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-slider-focused.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-slider-handle.png b/src/imports/controls/doc/images/qtquickcontrols2-slider-handle.png deleted file mode 100644 index 7878e0f8..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-slider-handle.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-slider-normal.png b/src/imports/controls/doc/images/qtquickcontrols2-slider-normal.png deleted file mode 100644 index dac102de..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-slider-normal.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-slider-track.png b/src/imports/controls/doc/images/qtquickcontrols2-slider-track.png deleted file mode 100644 index 868fa420..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-slider-track.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-slider.gif b/src/imports/controls/doc/images/qtquickcontrols2-slider.gif deleted file mode 100644 index 59c94796..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-slider.gif and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-switch-background.png b/src/imports/controls/doc/images/qtquickcontrols2-switch-background.png deleted file mode 100644 index bfa24fe6..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-switch-background.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-switch-checked.png b/src/imports/controls/doc/images/qtquickcontrols2-switch-checked.png deleted file mode 100644 index fadf851a..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-switch-checked.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-switch-disabled.png b/src/imports/controls/doc/images/qtquickcontrols2-switch-disabled.png deleted file mode 100644 index 328ff6a9..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-switch-disabled.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-switch-focused.png b/src/imports/controls/doc/images/qtquickcontrols2-switch-focused.png deleted file mode 100644 index 795868b8..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-switch-focused.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-switch-indicator.png b/src/imports/controls/doc/images/qtquickcontrols2-switch-indicator.png deleted file mode 100644 index 5fc9c83b..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-switch-indicator.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-switch-label.png b/src/imports/controls/doc/images/qtquickcontrols2-switch-label.png deleted file mode 100644 index 57deabc6..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-switch-label.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-switch-normal.png b/src/imports/controls/doc/images/qtquickcontrols2-switch-normal.png deleted file mode 100644 index a162e898..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-switch-normal.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-switch.gif b/src/imports/controls/doc/images/qtquickcontrols2-switch.gif deleted file mode 100644 index b2e1b548..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-switch.gif and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-textfield-background.png b/src/imports/controls/doc/images/qtquickcontrols2-textfield-background.png deleted file mode 100644 index a2908200..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-textfield-background.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-textfield-disabled.png b/src/imports/controls/doc/images/qtquickcontrols2-textfield-disabled.png deleted file mode 100644 index bb5b779e..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-textfield-disabled.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-textfield-focused.png b/src/imports/controls/doc/images/qtquickcontrols2-textfield-focused.png deleted file mode 100644 index 5d8592c1..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-textfield-focused.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-textfield-normal.png b/src/imports/controls/doc/images/qtquickcontrols2-textfield-normal.png deleted file mode 100644 index 26ad9c11..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-textfield-normal.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-textfield-placeholder.png b/src/imports/controls/doc/images/qtquickcontrols2-textfield-placeholder.png deleted file mode 100644 index b040315f..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-textfield-placeholder.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-background.png b/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-background.png deleted file mode 100644 index 8f390b49..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-background.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-checked.png b/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-checked.png deleted file mode 100644 index fa883751..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-checked.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-disabled.png b/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-disabled.png deleted file mode 100644 index 794692b0..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-disabled.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-focused.png b/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-focused.png deleted file mode 100644 index f52e4686..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-focused.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-indicator.png b/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-indicator.png deleted file mode 100644 index 97e06e2c..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-indicator.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-label.png b/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-label.png deleted file mode 100644 index 3eb3ba35..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-label.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-normal.png b/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-normal.png deleted file mode 100644 index b066c565..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-normal.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-toolbar-background.png b/src/imports/controls/doc/images/qtquickcontrols2-toolbar-background.png deleted file mode 100644 index 28d4fd98..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-toolbar-background.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-toolbar-frame.png b/src/imports/controls/doc/images/qtquickcontrols2-toolbar-frame.png deleted file mode 100644 index 28d4fd98..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-toolbar-frame.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-toolbutton-background.png b/src/imports/controls/doc/images/qtquickcontrols2-toolbutton-background.png deleted file mode 100644 index fd105fee..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-toolbutton-background.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-toolbutton-label.png b/src/imports/controls/doc/images/qtquickcontrols2-toolbutton-label.png deleted file mode 100644 index 7aae8dc8..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-toolbutton-label.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-tumbler-background.png b/src/imports/controls/doc/images/qtquickcontrols2-tumbler-background.png deleted file mode 100644 index aa736615..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-tumbler-background.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-tumbler-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-tumbler-contentItem.png deleted file mode 100644 index aa736615..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-tumbler-contentItem.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-tumbler-delegate.png b/src/imports/controls/doc/images/qtquickcontrols2-tumbler-delegate.png deleted file mode 100644 index 77c51efd..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-tumbler-delegate.png and /dev/null differ diff --git a/src/imports/controls/doc/images/qtquickcontrols2-tumbler-wrap.gif b/src/imports/controls/doc/images/qtquickcontrols2-tumbler-wrap.gif deleted file mode 100644 index 2a7e435d..00000000 Binary files a/src/imports/controls/doc/images/qtquickcontrols2-tumbler-wrap.gif and /dev/null differ diff --git a/src/imports/controls/doc/qtlabscontrols.qdocconf b/src/imports/controls/doc/qtlabscontrols.qdocconf new file mode 100644 index 00000000..ae3f2a75 --- /dev/null +++ b/src/imports/controls/doc/qtlabscontrols.qdocconf @@ -0,0 +1,52 @@ +include($QT_INSTALL_DOCS/global/qt-module-defaults.qdocconf) + +project = QtLabsControls +description = Qt Labs Controls Reference Documentation +version = $QT_VERSION + +qhp.projects = QtLabsControls + +qhp.QtLabsControls.file = qtlabscontrols.qhp +qhp.QtLabsControls.namespace = org.qt-project.qtlabscontrols.$QT_VERSION_TAG +qhp.QtLabsControls.virtualFolder = qtlabscontrols +qhp.QtLabsControls.indexTitle = Qt Labs Controls +qhp.QtLabsControls.indexRoot = + +qhp.QtLabsControls.filterAttributes = qtlabscontrols $QT_VERSION qtrefdoc +qhp.QtLabsControls.customFilters.Qt.name = QtLabsControls $QT_VERSION +qhp.QtLabsControls.customFilters.Qt.filterAttributes = qtlabscontrols $QT_VERSION + +qhp.QtLabsControls.subprojects = qtlabscontrolsqmltypes + +qhp.QtLabsControls.subprojects.qtlabscontrolsqmltypes.title = Controls QML Types +qhp.QtLabsControls.subprojects.qtlabscontrolsqmltypes.indexTitle = Qt Labs Controls QML Types +qhp.QtLabsControls.subprojects.qtlabscontrolsqmltypes.selectors = qmlclass +qhp.QtLabsControls.subprojects.qtlabscontrolsqmltypes.sortPages = true + +depends = qtcore qtgui qtdoc qtqml qtquick qtquicklayouts qtquickdialogs qtquickcontrols + +# Specify the install path under QT_INSTALL_EXAMPLES +# Note: paths passed to \example command must contain the parent directory, e.g. +# \example controls/tabs +exampledirs += ../../../../examples/quick \ + ../ \ + ../../../templates \ + ../../calendar \ + ../../../../tests/auto/controls/data \ + ../../../../tests/auto/snippets/data \ + snippets + +examplesinstallpath = quick + +headerdirs += ../../../templates \ + ../../calendar \ + +sourcedirs += ../../../templates \ + ../../calendar + +imagedirs += images + +navigation.landingpage = "Qt Labs Controls" +navigation.qmltypespage = "Qt Labs Controls QML Types" + +tagfile = qtlabscontrols.tags diff --git a/src/imports/controls/doc/qtquickcontrols2.qdocconf b/src/imports/controls/doc/qtquickcontrols2.qdocconf deleted file mode 100644 index db9d8e1b..00000000 --- a/src/imports/controls/doc/qtquickcontrols2.qdocconf +++ /dev/null @@ -1,57 +0,0 @@ -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 - -# Specify the install path under QT_INSTALL_EXAMPLES -# Note: paths passed to \example command must contain the parent directory, e.g. -# \example controls/tabs -exampledirs += ../../../../examples/quick \ - ../ \ - ../../../templates \ - ../../calendar \ - ../../../../tests/auto/controls/data \ - ../../../../tests/auto/snippets/data \ - snippets - -examplesinstallpath = quick - -headerdirs += ../../../templates \ - ../../calendar \ - -sourcedirs += ../../../templates \ - ../../calendar - -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 index 62ab2466..11fee906 100644 --- a/src/imports/controls/doc/snippets/basic-example.qml +++ b/src/imports/controls/doc/snippets/basic-example.qml @@ -27,7 +27,7 @@ //! [0] import QtQuick 2.6 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 ApplicationWindow { title: "My Application" diff --git a/src/imports/controls/doc/src/calendar/qtlabscalendar-index.qdoc b/src/imports/controls/doc/src/calendar/qtlabscalendar-index.qdoc index dedfad4c..02e92bf0 100644 --- a/src/imports/controls/doc/src/calendar/qtlabscalendar-index.qdoc +++ b/src/imports/controls/doc/src/calendar/qtlabscalendar-index.qdoc @@ -44,6 +44,6 @@ \list \li \l{Qt Quick} \li \l{Qt Quick Layouts} - \li \l{Qt Quick Controls 2} + \li \l{Qt Labs Controls} \endlist */ diff --git a/src/imports/controls/doc/src/calendar/qtlabscalendar.qdoc b/src/imports/controls/doc/src/calendar/qtlabscalendar.qdoc index b363195a..f483ae91 100644 --- a/src/imports/controls/doc/src/calendar/qtlabscalendar.qdoc +++ b/src/imports/controls/doc/src/calendar/qtlabscalendar.qdoc @@ -33,7 +33,7 @@ The \l{Qt Labs Calendar} module provides QML types for creating calendars. These QML types work in conjunction with \l{Qt Quick} and - \l{Qt Quick Controls 2}. + \l{Qt Labs Controls}. The QML types can be imported into your application using the following import statement in your .qml file: @@ -49,7 +49,7 @@ \section1 Related Information \list - \li \l {Qt Quick Controls 2 QML Types} + \li \l {Qt Labs Controls QML Types} \endlist \noautolist diff --git a/src/imports/controls/doc/src/qtlabscontrols-customize.qdoc b/src/imports/controls/doc/src/qtlabscontrols-customize.qdoc new file mode 100644 index 00000000..5f48f418 --- /dev/null +++ b/src/imports/controls/doc/src/qtlabscontrols-customize.qdoc @@ -0,0 +1,391 @@ +/**************************************************************************** +** +** 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 qtlabscontrols-customize.html + \title Customizing Qt Labs Controls + \brief A set of UI controls to create user interfaces in Qt Quick + + Qt Labs 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 qtlabscontrols-busyindicator-background.png + + BusyIndicator has no background item by default. + + \section3 Indicator + + \image qtlabscontrols-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 qtlabscontrols-button-background.png + + \snippet Button.qml background + + \section3 Label + + \image qtlabscontrols-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 qtlabscontrols-checkbox-background.png + + CheckBox has no background item by default. + + \section3 Label + + \image qtlabscontrols-checkbox-label.png + + \snippet CheckBox.qml label + + \section3 Indicator + + \image qtlabscontrols-checkbox-indicator.png + + \snippet CheckBox.qml indicator + + \section1 Customizing Dial + + Dial consists of two visual items: \l {Control::background}{background} + and \l {Dial::handle}{handle}. + + \section3 Background + + \image qtlabscontrols-dial-background.png + + \snippet Dial.qml background + + \section3 Indicator + + \image qtlabscontrols-dial-handle.png + + \snippet Dial.qml handle + + + \section1 Customizing Frame + + Frame consists of two visual items: \l {Control::background}{background} + and \l {Frame::frame}{frame}. + + \section3 Background + + \image qtlabscontrols-frame-background.png + + Frame has no background item by default. + + \section3 Frame + + \image qtlabscontrols-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 qtlabscontrols-groupbox-background.png + + GroupBox has no background item by default. + + \section3 Frame + + \image qtlabscontrols-groupbox-frame.png + + \snippet GroupBox.qml frame + + \section3 Label + + \image qtlabscontrols-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 qtlabscontrols-progressbar-background.png + + \snippet ProgressBar.qml background + + \section3 Indicator + + \image qtlabscontrols-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 qtlabscontrols-radiobutton-background.png + + RadioButton has no background item by default. + + \section3 Label + + \image qtlabscontrols-radiobutton-label.png + + \snippet RadioButton.qml label + + \section3 Indicator + + \image qtlabscontrols-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 qtlabscontrols-scrollbar-background.png + + ScrollBar has no background item by default. + + \section3 Handle + + \image qtlabscontrols-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 qtlabscontrols-scrollindicator-background.png + + ScrollIndicator has no background item by default. + + \section3 Indicator + + \image qtlabscontrols-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 qtlabscontrols-slider-background.png + + Slider has no background item by default. + + \section3 Track + + \image qtlabscontrols-slider-track.png + + \snippet Slider.qml track + + \section3 Handle + + \image qtlabscontrols-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 qtlabscontrols-switch-background.png + + Switch has no background item by default. + + \section3 Label + + \image qtlabscontrols-switch-label.png + + \snippet Switch.qml label + + \section3 Indicator + + \image qtlabscontrols-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 qtlabscontrols-textfield-background.png + + \snippet TextField.qml background + + \section3 Placeholder + + \image qtlabscontrols-textfield-placeholder.png + + \snippet TextField.qml placeholder + + + \section1 Customizing ToolBar + + ToolBar consists of two visual items: \l {Control::background}{background} and + \l {Frame::frame}{frame}. + + \section3 Background + + \image qtlabscontrols-toolbar-background.png + + \snippet ToolBar.qml background + + \section3 Frame + + \image qtlabscontrols-toolbar-frame.png + + ToolBar 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 qtlabscontrols-toolbutton-background.png + + \snippet ToolButton.qml background + + \section3 Label + + \image qtlabscontrols-toolbutton-label.png + + \snippet ToolButton.qml label + + \section1 Customizing Tumbler + + Tumbler consists of three visual items: + \l {Control::background}{background}, + \l {Control::contentItem}{contentItem}, and + \l {Tumbler::delegate}{delegate}. + + \section3 Background + + \image qtlabscontrols-tumbler-background.png + + Tumbler has no background item by default. + + \section3 Content Item + + \image qtlabscontrols-tumbler-contentItem.png + + \snippet Tumbler.qml contentItem + + \section3 Delegate + + \image qtlabscontrols-tumbler-delegate.png + + \snippet Tumbler.qml delegate +*/ diff --git a/src/imports/controls/doc/src/qtlabscontrols-index.qdoc b/src/imports/controls/doc/src/qtlabscontrols-index.qdoc new file mode 100644 index 00000000..e24b269a --- /dev/null +++ b/src/imports/controls/doc/src/qtlabscontrols-index.qdoc @@ -0,0 +1,342 @@ +/**************************************************************************** +** +** 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 qtlabscontrols-index.html + \title Qt Labs Controls + + \brief Provides a set of UI controls for Qt Quick. + + Qt Labs Controls provides a set of controls that can be used + to build complete interfaces in Qt Quick. + + \section1 QML Types + + \section2 Qt.labs.controls Module + \generatelist {qmltypesbymodule Qt.labs.controls} + + \section2 Qt.labs.calendar Module + \generatelist {qmltypesbymodule Qt.labs.calendar} + + \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 Labs Controls 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 Labs Controls, 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 Labs Controls 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 Labs Controls + \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 Labs Controls 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 Labs Controls: + + \qml + Button { + label: Label { + // ... + } + } + \endqml + + \section3 Preparing for Migration + + With this in mind, a good way to prepare for a migration to Qt Quick + Labs is to place each control that you have a custom style for in its + own QML file. For example, the Qt Quick Controls button above could be moved to a + file named Button.qml, and used in the following manner: + + \badcode + import "controls" as Controls + + Controls.Button { + ... + } + \endcode + + This works with both modules, and will reduce the amount of work needed + when the migration begins. + + \section3 Type Changes + + \table + \header + \li Qt Quick Controls + \li Qt Labs Controls + \row + \li \l [QtQuickControls] {Action} + \li No equivalent; see \l [QtQuick] {Shortcut} instead. + \row + \li \l [QtQuickControls] {ApplicationWindow} + \li \l [QtLabsControls] {ApplicationWindow} + \row + \li \l [QtQuickControls] {BusyIndicator} + \li \l [QtLabsControls] {BusyIndicator} + \row + \li \l [QtQuickControls] {Button} + \li \l [QtLabsControls] {Button} + \row + \li \l [QtQuickControls] {Calendar} + \li No equivalent; see \l [QML] {CalendarView} instead. + \row + \li \l [QtQuickControls] {CheckBox} + \li \l [QtLabsControls] {CheckBox} + \row + \li \l [QtQuickControls] {ExclusiveGroup} + \li \l [QtLabsControls] {ExclusiveGroup} + \row + \li \l [QtQuickControls] {GroupBox} + + \li \l [QtLabsControls] {GroupBox}, or \l [QtLabsControls] {Frame} + if a title is not required. + + \row + \li \l [QtQuickControls] {Label} + \li \l [QtLabsControls] {Label} + \row + \li \l [QtQuickControls] {ProgressBar} + \li \l [QtLabsControls] {ProgressBar} + \row + \li \l [QtQuickControls] {RadioButton} + \li \l [QtLabsControls] {RadioButton} + \row + \li \l [QtQuickControls] {ScrollView} + \li \l [QtLabsControls] {ScrollBar}, + \l [QtLabsControls] {ScrollIndicator} + \row + \li \l [QtQuickControls] {Slider} + \li \l [QtLabsControls] {Slider} + \row + \li \l [QtQuickControls] {SpinBox} + \li No equivalent; see \l [QtLabsControls] {Tumbler} instead. + \row + \li \l [QtQuickControls] {Stack}, + \l [QtQuickControls] {StackView}, + \l [QtQuickControls] {StackViewDelegate} + \li \l [QtLabsControls] {StackView} + \row + \li \l [QtQuickControls] {StatusBar} + \li No equivalent + \row + \li \l [QtQuickControls] {Switch} + \li \l [QtLabsControls] {Switch} + \row + \li \l [QtQuickControls] {Tab}, + \l [QtQuickControls] {TabView} + \li \l [QtLabsControls] {TabBar} in combination with, for example, + \l [QtLabsControls] {SwipeView}. + \row + \li \l [QtQuickControls] {TableView} + \li No equivalent + \row + \li \l [QtQuickControls] {TextArea} + \li \l [QtLabsControls] {TextArea} + \row + \li \l [QtQuickControls] {TextField} + \li \l [QtLabsControls] {TextField} + \row + \li \l [QtQuickControls] {ToolBar} + \li \l [QtLabsControls] {ToolBar} + \row + \li \l [QtQuickControls] {ToolButton} + \li \l [QtLabsControls] {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 Labs Controls, 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 + #include + + 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 Labs Controls + + TODO + + \section1 Related Information + + \list + \li \l{Qt Quick} + \li \l{Qt Quick Layouts} + \li \l{Qt Labs Calendar} + \li \l{Qt Labs Controls QML Types}{Qt Labs Controls QML Types} + \endlist +*/ diff --git a/src/imports/controls/doc/src/qtlabscontrols.qdoc b/src/imports/controls/doc/src/qtlabscontrols.qdoc new file mode 100644 index 00000000..1ddfc967 --- /dev/null +++ b/src/imports/controls/doc/src/qtlabscontrols.qdoc @@ -0,0 +1,60 @@ +/**************************************************************************** +** +** 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 Qt.labs.controls 1.0 + \title Qt Labs Controls QML Types + \ingroup qmlmodules + \brief Provides QML types for user interfaces (Qt Labs Controls). + + \l{Qt Labs Controls} provides QML types for creating user interfaces. + These QML types work in conjunction with \l{Qt Quick} and + \l{Qt Quick Layouts}. + + Qt Labs Controls QML types can be imported into your application + using the following import statement in your .qml file: + + \badcode + import Qt.labs.controls 1.0 + \endcode + + The CalendarView and related QML types can be imported using the + following statement: + + \badcode + import Qt.labs.calendar 1.0 + \endcode + + \section1 QML Types + + \section2 Qt.labs.controls Module + \generatelist {qmltypesbymodule Qt.labs.controls} + + \section2 Qt.labs.calendar Module + \generatelist {qmltypesbymodule Qt.labs.calendar} + \noautolist +*/ diff --git a/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc deleted file mode 100644 index 7b4176f5..00000000 --- a/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc +++ /dev/null @@ -1,391 +0,0 @@ -/**************************************************************************** -** -** 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 Dial - - Dial consists of two visual items: \l {Control::background}{background} - and \l {Dial::handle}{handle}. - - \section3 Background - - \image qtquickcontrols2-dial-background.png - - \snippet Dial.qml background - - \section3 Indicator - - \image qtquickcontrols2-dial-handle.png - - \snippet Dial.qml handle - - - \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 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 - - ToolBar 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 - - \section1 Customizing Tumbler - - Tumbler consists of three visual items: - \l {Control::background}{background}, - \l {Control::contentItem}{contentItem}, and - \l {Tumbler::delegate}{delegate}. - - \section3 Background - - \image qtquickcontrols2-tumbler-background.png - - Tumbler has no background item by default. - - \section3 Content Item - - \image qtquickcontrols2-tumbler-contentItem.png - - \snippet Tumbler.qml contentItem - - \section3 Delegate - - \image qtquickcontrols2-tumbler-delegate.png - - \snippet Tumbler.qml delegate -*/ diff --git a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc deleted file mode 100644 index ab8b9aaa..00000000 --- a/src/imports/controls/doc/src/qtquickcontrols2-index.qdoc +++ /dev/null @@ -1,342 +0,0 @@ -/**************************************************************************** -** -** 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 Provides a set of UI controls for Qt Quick. - - Qt Quick Controls 2 provides a set of controls that can be used - to build complete interfaces in Qt Quick. - - \section1 QML Types - - \section2 QtQuick.Controls Module - \generatelist {qmltypesbymodule QtQuick.Controls} - - \section2 Qt.labs.calendar Module - \generatelist {qmltypesbymodule Qt.labs.calendar} - - \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 Preparing for Migration - - With this in mind, a good way to prepare for a migration to Qt Quick - Controls 2 is to place each control that you have a custom style for in its - own QML file. For example, the Qt Quick Controls button above could be moved to a - file named Button.qml, and used in the following manner: - - \badcode - import "controls" as Controls - - Controls.Button { - ... - } - \endcode - - This works with both modules, and will reduce the amount of work needed - when the migration begins. - - \section3 Type Changes - - \table - \header - \li Qt Quick Controls - \li Qt Quick Controls 2 - \row - \li \l [QtQuickControls] {Action} - \li 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 [QtQuickControls2] {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 [QtQuickControls2] {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 - #include - - 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 Labs Calendar} - \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 deleted file mode 100644 index a02ab439..00000000 --- a/src/imports/controls/doc/src/qtquickcontrols2.qdoc +++ /dev/null @@ -1,60 +0,0 @@ -/**************************************************************************** -** -** 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 (Qt Quick Controls 2). - - \l{Qt Quick Controls 2} provides QML types for creating user interfaces. - These QML types work in conjunction with \l{Qt Quick} and - \l{Qt Quick Layouts}. - - Qt Quick Controls 2 QML types can be imported into your application - using the following import statement in your .qml file: - - \badcode - import QtQuick.Controls 2.0 - \endcode - - The CalendarView and related QML types can be imported using the - following statement: - - \badcode - import Qt.labs.calendar 1.0 - \endcode - - \section1 QML Types - - \section2 QtQuick.Controls Module - \generatelist {qmltypesbymodule QtQuick.Controls} - - \section2 Qt.labs.calendar Module - \generatelist {qmltypesbymodule Qt.labs.calendar} - \noautolist -*/ diff --git a/src/imports/controls/qmldir b/src/imports/controls/qmldir index 38828356..9a3ca0ef 100644 --- a/src/imports/controls/qmldir +++ b/src/imports/controls/qmldir @@ -1,4 +1,4 @@ -module QtQuick.Controls -plugin qtquickcontrols2plugin -classname QtQuickControls2Plugin +module Qt.labs.controls +plugin qtlabscontrolsplugin +classname QtLabsControlsPlugin depends QtQuick.Templates 2.0 diff --git a/src/imports/controls/qquicktheme.cpp b/src/imports/controls/qquicktheme.cpp index 3cfbc689..395d60d7 100644 --- a/src/imports/controls/qquicktheme.cpp +++ b/src/imports/controls/qquicktheme.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. +** This file is part of the Qt Labs Controls module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -51,7 +51,7 @@ QT_BEGIN_NAMESPACE \qmltype Theme \inherits QtObject \instantiates QQuickThemeAttached - \inqmlmodule QtQuick.Controls + \inqmlmodule Qt.labs.controls \ingroup utilities \brief A theme interface. @@ -59,46 +59,46 @@ QT_BEGIN_NAMESPACE */ /*! - \qmlattachedproperty color QtQuick.Controls::Theme::accentColor + \qmlattachedproperty color Qt.labs.controls::Theme::accentColor */ /*! - \qmlattachedproperty color QtQuick.Controls::Theme::backgroundColor + \qmlattachedproperty color Qt.labs.controls::Theme::backgroundColor */ /*! - \qmlattachedproperty color QtQuick.Controls::Theme::disabledColor + \qmlattachedproperty color Qt.labs.controls::Theme::disabledColor */ /*! - \qmlattachedproperty color QtQuick.Controls::Theme::focusColor + \qmlattachedproperty color Qt.labs.controls::Theme::focusColor */ /*! - \qmlattachedproperty color QtQuick.Controls::Theme::frameColor + \qmlattachedproperty color Qt.labs.controls::Theme::frameColor */ /*! - \qmlattachedproperty color QtQuick.Controls::Theme::pressColor + \qmlattachedproperty color Qt.labs.controls::Theme::pressColor */ /*! - \qmlattachedproperty color QtQuick.Controls::Theme::selectedTextColor + \qmlattachedproperty color Qt.labs.controls::Theme::selectedTextColor */ /*! - \qmlattachedproperty color QtQuick.Controls::Theme::selectionColor + \qmlattachedproperty color Qt.labs.controls::Theme::selectionColor */ /*! - \qmlattachedproperty color QtQuick.Controls::Theme::shadowColor + \qmlattachedproperty color Qt.labs.controls::Theme::shadowColor */ /*! - \qmlattachedproperty color QtQuick.Controls::Theme::textColor + \qmlattachedproperty color Qt.labs.controls::Theme::textColor */ -Q_GLOBAL_STATIC_WITH_ARGS(QQuickThemeData, globalThemeData, (QString::fromLatin1(":/qtquickcontrols/theme.json"))) +Q_GLOBAL_STATIC_WITH_ARGS(QQuickThemeData, globalThemeData, (QString::fromLatin1(":/qtlabscontrols/theme.json"))) static QQuickThemeAttached *themeInstance(QQmlEngine *engine) { diff --git a/src/imports/controls/qquicktheme_p.h b/src/imports/controls/qquicktheme_p.h index bdb6592a..02ad5619 100644 --- a/src/imports/controls/qquicktheme_p.h +++ b/src/imports/controls/qquicktheme_p.h @@ -3,7 +3,7 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. +** This file is part of the Qt Labs Controls module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage diff --git a/src/imports/controls/qquickthemedata.cpp b/src/imports/controls/qquickthemedata.cpp index df924860..e5624412 100644 --- a/src/imports/controls/qquickthemedata.cpp +++ b/src/imports/controls/qquickthemedata.cpp @@ -3,7 +3,7 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. +** This file is part of the Qt Labs Controls module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage @@ -64,13 +64,13 @@ bool QQuickThemeData::load(const QString &filePath) QFile file(filePath); if (!file.open(QFile::ReadOnly | QFile::Text)) { qDebug() << file.error(); - qWarning() << "QQuickTheme: failed to open ':/qtquickcontrols/theme.json': " << qPrintable(file.errorString()); + qWarning() << "QQuickTheme: failed to open ':/qtlabscontrols/theme.json': " << qPrintable(file.errorString()); return false; } else { QJsonParseError error; doc = QJsonDocument::fromJson(file.readAll(), &error); if (error.error != QJsonParseError::NoError) { - qWarning() << "QQuickTheme: failed to parse ':/qtquickcontrols/theme.json': " << qPrintable(error.errorString()); + qWarning() << "QQuickTheme: failed to parse ':/qtlabscontrols/theme.json': " << qPrintable(error.errorString()); return false; } } diff --git a/src/imports/controls/qquickthemedata_p.h b/src/imports/controls/qquickthemedata_p.h index 1e0b40bb..6154aa2a 100644 --- a/src/imports/controls/qquickthemedata_p.h +++ b/src/imports/controls/qquickthemedata_p.h @@ -3,7 +3,7 @@ ** Copyright (C) 2015 The Qt Company Ltd. ** Contact: http://www.qt.io/licensing/ ** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. +** This file is part of the Qt Labs Controls module of the Qt Toolkit. ** ** $QT_BEGIN_LICENSE:LGPL3$ ** Commercial License Usage diff --git a/src/imports/controls/qtlabscontrolsplugin.cpp b/src/imports/controls/qtlabscontrolsplugin.cpp new file mode 100644 index 00000000..d1d88be2 --- /dev/null +++ b/src/imports/controls/qtlabscontrolsplugin.cpp @@ -0,0 +1,108 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the Qt Labs Controls module of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL3$ +** 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 Lesser General Public License Usage +** Alternatively, this file may be used under the terms of the GNU Lesser +** General Public License version 3 as published by the Free Software +** Foundation and appearing in the file LICENSE.LGPLv3 included in the +** packaging of this file. Please review the following information to +** ensure the GNU Lesser General Public License version 3 requirements +** will be met: https://www.gnu.org/licenses/lgpl.html. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU +** General Public License version 2.0 or later as published by the Free +** Software Foundation and appearing in the file LICENSE.GPL included in +** the packaging of this file. Please review the following information to +** ensure the GNU General Public License version 2.0 requirements will be +** met: http://www.gnu.org/licenses/gpl-2.0.html. +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include +#include +#include + +#include + +#include "qquicktheme_p.h" + +void initResources() +{ + Q_INIT_RESOURCE(qtlabscontrolsplugin); +} + +QT_BEGIN_NAMESPACE + +class QtLabsControlsPlugin: public QQmlExtensionPlugin +{ + Q_OBJECT + Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0") + +public: + void registerTypes(const char *uri); + void initializeEngine(QQmlEngine *engine, const char *uri); +}; + +void QtLabsControlsPlugin::registerTypes(const char *uri) +{ + qmlRegisterUncreatableType(uri, 1, 0, "Theme", "Theme is an attached property"); + + qmlRegisterType(uri, 1, 0, "ExclusiveGroup"); + qmlRegisterType(); + + // TODO: read the style from application manifest file + QFileSelector selector; + QString base = baseUrl().toString(); + qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/ApplicationWindow.qml"))), uri, 1, 0, "ApplicationWindow"); + qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/BusyIndicator.qml"))), uri, 1, 0, "BusyIndicator"); + qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/Button.qml"))), uri, 1, 0, "Button"); + qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/CheckBox.qml"))), uri, 1, 0, "CheckBox"); + qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/Dial.qml"))), uri, 1, 0, "Dial"); + qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/Drawer.qml"))), uri, 1, 0, "Drawer"); + qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/Frame.qml"))), uri, 1, 0, "Frame"); + qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/GroupBox.qml"))), uri, 1, 0, "GroupBox"); + qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/Label.qml"))), uri, 1, 0, "Label"); + qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/PageIndicator.qml"))), uri, 1, 0, "PageIndicator"); + qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/ProgressBar.qml"))), uri, 1, 0, "ProgressBar"); + qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/RadioButton.qml"))), uri, 1, 0, "RadioButton"); + qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/ScrollBar.qml"))), uri, 1, 0, "ScrollBar"); + qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/ScrollIndicator.qml"))), uri, 1, 0, "ScrollIndicator"); + qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/Slider.qml"))), uri, 1, 0, "Slider"); + qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/StackView.qml"))), uri, 1, 0, "StackView"); + qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/SwipeView.qml"))), uri, 1, 0, "SwipeView"); + qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/Switch.qml"))), uri, 1, 0, "Switch"); + qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/TabBar.qml"))), uri, 1, 0, "TabBar"); + qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/TabButton.qml"))), uri, 1, 0, "TabButton"); + qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/TextArea.qml"))), uri, 1, 0, "TextArea"); + qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/TextField.qml"))), uri, 1, 0, "TextField"); + qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/ToolBar.qml"))), uri, 1, 0, "ToolBar"); + qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/ToolButton.qml"))), uri, 1, 0, "ToolButton"); + qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/Tumbler.qml"))), uri, 1, 0, "Tumbler"); +} + +void QtLabsControlsPlugin::initializeEngine(QQmlEngine *engine, const char *uri) +{ + Q_UNUSED(engine); + Q_UNUSED(uri); + initResources(); +} + +QT_END_NAMESPACE + +#include "qtlabscontrolsplugin.moc" diff --git a/src/imports/controls/qtlabscontrolsplugin.qrc b/src/imports/controls/qtlabscontrolsplugin.qrc new file mode 100644 index 00000000..b71ec91c --- /dev/null +++ b/src/imports/controls/qtlabscontrolsplugin.qrc @@ -0,0 +1,10 @@ + + + theme.json + + + images/spinner_small.png + images/spinner_medium.png + images/spinner_large.png + + diff --git a/src/imports/controls/qtquickcontrols2plugin.cpp b/src/imports/controls/qtquickcontrols2plugin.cpp deleted file mode 100644 index ce8bce86..00000000 --- a/src/imports/controls/qtquickcontrols2plugin.cpp +++ /dev/null @@ -1,108 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the Qt Quick Controls module of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL3$ -** 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 Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPLv3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or later as published by the Free -** Software Foundation and appearing in the file LICENSE.GPL included in -** the packaging of this file. Please review the following information to -** ensure the GNU General Public License version 2.0 requirements will be -** met: http://www.gnu.org/licenses/gpl-2.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include -#include - -#include - -#include "qquicktheme_p.h" - -void initResources() -{ - Q_INIT_RESOURCE(qtquickcontrols2plugin); -} - -QT_BEGIN_NAMESPACE - -class QtQuickControls2Plugin: public QQmlExtensionPlugin -{ - Q_OBJECT - Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0") - -public: - void registerTypes(const char *uri); - void initializeEngine(QQmlEngine *engine, const char *uri); -}; - -void QtQuickControls2Plugin::registerTypes(const char *uri) -{ - qmlRegisterUncreatableType(uri, 2, 0, "Theme", "Theme is an attached property"); - - qmlRegisterType(uri, 2, 0, "ExclusiveGroup"); - qmlRegisterType(); - - // TODO: read the style from application manifest file - QFileSelector selector; - QString base = baseUrl().toString(); - qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/ApplicationWindow.qml"))), uri, 2, 0, "ApplicationWindow"); - qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/BusyIndicator.qml"))), uri, 2, 0, "BusyIndicator"); - qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/Button.qml"))), uri, 2, 0, "Button"); - qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/CheckBox.qml"))), uri, 2, 0, "CheckBox"); - qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/Dial.qml"))), uri, 2, 0, "Dial"); - qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/Drawer.qml"))), uri, 2, 0, "Drawer"); - qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/Frame.qml"))), uri, 2, 0, "Frame"); - qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/GroupBox.qml"))), uri, 2, 0, "GroupBox"); - qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/Label.qml"))), uri, 2, 0, "Label"); - qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/PageIndicator.qml"))), uri, 2, 0, "PageIndicator"); - qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/ProgressBar.qml"))), uri, 2, 0, "ProgressBar"); - qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/RadioButton.qml"))), uri, 2, 0, "RadioButton"); - qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/ScrollBar.qml"))), uri, 2, 0, "ScrollBar"); - qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/ScrollIndicator.qml"))), uri, 2, 0, "ScrollIndicator"); - qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/Slider.qml"))), uri, 2, 0, "Slider"); - qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/StackView.qml"))), uri, 2, 0, "StackView"); - qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/SwipeView.qml"))), uri, 2, 0, "SwipeView"); - qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/Switch.qml"))), uri, 2, 0, "Switch"); - qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/TabBar.qml"))), uri, 2, 0, "TabBar"); - qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/TabButton.qml"))), uri, 2, 0, "TabButton"); - qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/TextArea.qml"))), uri, 2, 0, "TextArea"); - qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/TextField.qml"))), uri, 2, 0, "TextField"); - qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/ToolBar.qml"))), uri, 2, 0, "ToolBar"); - qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/ToolButton.qml"))), uri, 2, 0, "ToolButton"); - qmlRegisterType(selector.select(QUrl(base + QStringLiteral("/Tumbler.qml"))), uri, 2, 0, "Tumbler"); -} - -void QtQuickControls2Plugin::initializeEngine(QQmlEngine *engine, const char *uri) -{ - Q_UNUSED(engine); - Q_UNUSED(uri); - initResources(); -} - -QT_END_NAMESPACE - -#include "qtquickcontrols2plugin.moc" diff --git a/src/imports/controls/qtquickcontrols2plugin.qrc b/src/imports/controls/qtquickcontrols2plugin.qrc deleted file mode 100644 index 64ba7018..00000000 --- a/src/imports/controls/qtquickcontrols2plugin.qrc +++ /dev/null @@ -1,10 +0,0 @@ - - - theme.json - - - images/spinner_small.png - images/spinner_medium.png - images/spinner_large.png - - -- cgit v1.2.3