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 --- .gitignore | 8 +- examples/examples.pro | 3 +- examples/labs/calendar/DateTimePicker.qml | 2 +- examples/labs/calendar/EventView.qml | 2 +- examples/labs/calendar/TumblerDelegate.qml | 2 +- examples/labs/calendar/main.qml | 2 +- examples/labs/controls/controls.pro | 6 + examples/labs/controls/drawer/drawer.pro | 15 + examples/labs/controls/drawer/drawer.qrc | 7 + examples/labs/controls/drawer/images/arrow.png | Bin 0 -> 2446 bytes examples/labs/controls/drawer/images/qt-logo.png | Bin 0 -> 21710 bytes examples/labs/controls/drawer/main.cpp | 52 +++ examples/labs/controls/drawer/main.qml | 157 +++++++++ examples/labs/controls/mirroring/main.cpp | 52 +++ examples/labs/controls/mirroring/main.qml | 238 +++++++++++++ examples/labs/controls/mirroring/mirroring.pro | 15 + examples/labs/controls/mirroring/mirroring.qrc | 5 + examples/labs/controls/tabs/images/qt-logo.png | Bin 0 -> 21710 bytes examples/labs/controls/tabs/main.cpp | 52 +++ examples/labs/controls/tabs/main.qml | 291 +++++++++++++++ examples/labs/controls/tabs/tabs.pro | 15 + examples/labs/controls/tabs/tabs.qrc | 6 + examples/labs/controls/theme/main.cpp | 52 +++ examples/labs/controls/theme/main.qml | 175 +++++++++ examples/labs/controls/theme/theme.pro | 15 + examples/labs/controls/theme/theme.qrc | 5 + examples/labs/labs.pro | 3 +- examples/quick/controls/controls.pro | 6 - examples/quick/controls/drawer/drawer.pro | 15 - examples/quick/controls/drawer/drawer.qrc | 7 - examples/quick/controls/drawer/images/arrow.png | Bin 2446 -> 0 bytes examples/quick/controls/drawer/images/qt-logo.png | Bin 21710 -> 0 bytes examples/quick/controls/drawer/main.cpp | 52 --- examples/quick/controls/drawer/main.qml | 157 --------- examples/quick/controls/mirroring/main.cpp | 52 --- examples/quick/controls/mirroring/main.qml | 238 ------------- examples/quick/controls/mirroring/mirroring.pro | 15 - examples/quick/controls/mirroring/mirroring.qrc | 5 - examples/quick/controls/tabs/images/qt-logo.png | Bin 21710 -> 0 bytes examples/quick/controls/tabs/main.cpp | 52 --- examples/quick/controls/tabs/main.qml | 291 --------------- examples/quick/controls/tabs/tabs.pro | 15 - examples/quick/controls/tabs/tabs.qrc | 6 - examples/quick/controls/theme/main.cpp | 52 --- examples/quick/controls/theme/main.qml | 175 --------- examples/quick/controls/theme/theme.pro | 15 - examples/quick/controls/theme/theme.qrc | 5 - examples/quick/quick.pro | 3 - src/imports/calendar/CalendarView.qml | 2 +- src/imports/calendar/DayOfWeekRow.qml | 2 +- src/imports/calendar/WeekNumberColumn.qml | 2 +- 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 - src/templates/qquickabstractbutton.cpp | 16 +- src/templates/qquickapplicationwindow.cpp | 6 +- src/templates/qquickbusyindicator.cpp | 8 +- src/templates/qquickbutton.cpp | 12 +- src/templates/qquickcheckable.cpp | 8 +- src/templates/qquickcheckbox.cpp | 10 +- src/templates/qquickcontainer.cpp | 24 +- src/templates/qquickcontrol.cpp | 28 +- src/templates/qquickdial.cpp | 24 +- src/templates/qquickexclusivegroup.cpp | 12 +- src/templates/qquickframe.cpp | 12 +- src/templates/qquickgroupbox.cpp | 6 +- src/templates/qquickpageindicator.cpp | 12 +- src/templates/qquickprogressbar.cpp | 20 +- src/templates/qquickradiobutton.cpp | 10 +- src/templates/qquickscrollbar.cpp | 18 +- src/templates/qquickscrollindicator.cpp | 16 +- src/templates/qquickslider.cpp | 36 +- src/templates/qquickstackview.cpp | 36 +- src/templates/qquickswipeview.cpp | 8 +- src/templates/qquickswitch.cpp | 16 +- src/templates/qquicktabbar.cpp | 2 +- src/templates/qquicktabbutton.cpp | 2 +- src/templates/qquicktextarea.cpp | 6 +- src/templates/qquicktextfield.cpp | 14 +- src/templates/qquicktoolbar.cpp | 2 +- src/templates/qquicktoolbutton.cpp | 2 +- src/templates/qquicktumbler.cpp | 16 +- tests/auto/accessibility/data/busyindicator.qml | 2 +- tests/auto/accessibility/data/button.qml | 2 +- tests/auto/accessibility/data/checkbox.qml | 2 +- tests/auto/accessibility/data/control.qml | 2 +- tests/auto/accessibility/data/dial.qml | 2 +- tests/auto/accessibility/data/label.qml | 2 +- tests/auto/accessibility/data/pageindicator.qml | 2 +- tests/auto/accessibility/data/progressbar.qml | 2 +- tests/auto/accessibility/data/radiobutton.qml | 2 +- tests/auto/accessibility/data/scrollbar.qml | 2 +- tests/auto/accessibility/data/scrollindicator.qml | 2 +- tests/auto/accessibility/data/slider.qml | 2 +- tests/auto/accessibility/data/switch.qml | 2 +- tests/auto/accessibility/data/tabbar.qml | 2 +- tests/auto/accessibility/data/tabbutton.qml | 2 +- tests/auto/accessibility/data/textarea-2.qml | 2 +- tests/auto/accessibility/data/textarea.qml | 2 +- tests/auto/accessibility/data/textfield-2.qml | 2 +- tests/auto/accessibility/data/textfield.qml | 2 +- tests/auto/accessibility/data/toolbar.qml | 2 +- tests/auto/accessibility/data/toolbutton.qml | 2 +- .../activeFocusOnTab/data/activeFocusOnTab.qml | 2 +- .../applicationwindow/data/activefocusontab.qml | 2 +- .../data/basicapplicationwindow.qml | 2 +- tests/auto/applicationwindow/data/defaultFocus.qml | 2 +- tests/auto/applicationwindow/data/fill.qml | 2 +- tests/auto/controls/data/TumblerDatePicker.qml | 2 +- tests/auto/controls/data/tst_busyindicator.qml | 2 +- tests/auto/controls/data/tst_button.qml | 2 +- tests/auto/controls/data/tst_checkbox.qml | 2 +- tests/auto/controls/data/tst_control.qml | 2 +- tests/auto/controls/data/tst_dial.qml | 2 +- tests/auto/controls/data/tst_drawer.qml | 2 +- tests/auto/controls/data/tst_exclusivegroup.qml | 2 +- tests/auto/controls/data/tst_frame.qml | 2 +- tests/auto/controls/data/tst_groupbox.qml | 2 +- tests/auto/controls/data/tst_label.qml | 2 +- tests/auto/controls/data/tst_pageindicator.qml | 2 +- tests/auto/controls/data/tst_progressbar.qml | 2 +- tests/auto/controls/data/tst_radiobutton.qml | 2 +- tests/auto/controls/data/tst_scrollbar.qml | 2 +- tests/auto/controls/data/tst_scrollindicator.qml | 2 +- tests/auto/controls/data/tst_slider.qml | 2 +- tests/auto/controls/data/tst_stackview.qml | 2 +- tests/auto/controls/data/tst_swipeview.qml | 2 +- tests/auto/controls/data/tst_switch.qml | 2 +- tests/auto/controls/data/tst_tabbar.qml | 2 +- tests/auto/controls/data/tst_textarea.qml | 2 +- tests/auto/controls/data/tst_textfield.qml | 2 +- tests/auto/controls/data/tst_theme.qml | 2 +- tests/auto/controls/data/tst_toolbar.qml | 2 +- tests/auto/controls/data/tst_toolbutton.qml | 2 +- tests/auto/controls/data/tst_tumbler.qml | 4 +- tests/auto/sanity/tst_sanity.cpp | 2 +- .../qtlabscontrols-busyindicator-background.qml | 9 + .../qtlabscontrols-busyindicator-indicator.qml | 10 + .../qtquickcontrols2-busyindicator-background.qml | 9 - .../qtquickcontrols2-busyindicator-indicator.qml | 10 - .../button/qtlabscontrols-button-background.qml | 12 + .../data/button/qtlabscontrols-button-disabled.qml | 8 + .../data/button/qtlabscontrols-button-focused.qml | 8 + .../data/button/qtlabscontrols-button-label.qml | 12 + .../data/button/qtlabscontrols-button-normal.qml | 7 + .../data/button/qtlabscontrols-button-pressed.qml | 8 + .../button/qtquickcontrols2-button-background.qml | 12 - .../button/qtquickcontrols2-button-disabled.qml | 8 - .../button/qtquickcontrols2-button-focused.qml | 8 - .../data/button/qtquickcontrols2-button-label.qml | 12 - .../data/button/qtquickcontrols2-button-normal.qml | 7 - .../button/qtquickcontrols2-button-pressed.qml | 8 - .../calendarmodel/qtlabscalendar-calendarmodel.qml | 2 +- .../qtlabscontrols-checkbox-background.qml | 10 + .../checkbox/qtlabscontrols-checkbox-checked.qml | 7 + .../checkbox/qtlabscontrols-checkbox-disabled.qml | 7 + .../checkbox/qtlabscontrols-checkbox-focused.qml | 7 + .../checkbox/qtlabscontrols-checkbox-indicator.qml | 11 + .../checkbox/qtlabscontrols-checkbox-label.qml | 11 + .../checkbox/qtlabscontrols-checkbox-normal.qml | 6 + .../qtquickcontrols2-checkbox-background.qml | 10 - .../checkbox/qtquickcontrols2-checkbox-checked.qml | 7 - .../qtquickcontrols2-checkbox-disabled.qml | 7 - .../checkbox/qtquickcontrols2-checkbox-focused.qml | 7 - .../qtquickcontrols2-checkbox-indicator.qml | 11 - .../checkbox/qtquickcontrols2-checkbox-label.qml | 11 - .../checkbox/qtquickcontrols2-checkbox-normal.qml | 6 - .../data/dial/qtlabscontrols-dial-background.qml | 10 + .../data/dial/qtlabscontrols-dial-handle.qml | 14 + .../data/dial/qtquickcontrols2-dial-background.qml | 10 - .../data/dial/qtquickcontrols2-dial-handle.qml | 14 - .../data/frame/qtlabscontrols-frame-background.qml | 11 + .../data/frame/qtlabscontrols-frame-frame.qml | 13 + .../frame/qtquickcontrols2-frame-background.qml | 11 - .../data/frame/qtquickcontrols2-frame-frame.qml | 13 - .../qtlabscontrols-groupbox-background.qml | 12 + .../groupbox/qtlabscontrols-groupbox-frame.qml | 14 + .../groupbox/qtlabscontrols-groupbox-label.qml | 14 + .../qtquickcontrols2-groupbox-background.qml | 12 - .../groupbox/qtquickcontrols2-groupbox-frame.qml | 14 - .../groupbox/qtquickcontrols2-groupbox-label.qml | 14 - .../qtlabscontrols-progressbar-background.qml | 11 + .../qtlabscontrols-progressbar-disabled.qml | 7 + .../qtlabscontrols-progressbar-indicator.qml | 13 + .../qtlabscontrols-progressbar-normal.qml | 6 + .../qtquickcontrols2-progressbar-background.qml | 11 - .../qtquickcontrols2-progressbar-disabled.qml | 7 - .../qtquickcontrols2-progressbar-indicator.qml | 13 - .../qtquickcontrols2-progressbar-normal.qml | 6 - .../qtlabscontrols-radiobutton-background.qml | 10 + .../qtlabscontrols-radiobutton-checked.qml | 7 + .../qtlabscontrols-radiobutton-disabled.qml | 7 + .../qtlabscontrols-radiobutton-focused.qml | 7 + .../qtlabscontrols-radiobutton-indicator.qml | 11 + .../qtlabscontrols-radiobutton-label.qml | 11 + .../qtlabscontrols-radiobutton-normal.qml | 6 + .../qtquickcontrols2-radiobutton-background.qml | 10 - .../qtquickcontrols2-radiobutton-checked.qml | 7 - .../qtquickcontrols2-radiobutton-disabled.qml | 7 - .../qtquickcontrols2-radiobutton-focused.qml | 7 - .../qtquickcontrols2-radiobutton-indicator.qml | 11 - .../qtquickcontrols2-radiobutton-label.qml | 11 - .../qtquickcontrols2-radiobutton-normal.qml | 6 - .../qtlabscontrols-scrollbar-background.qml | 13 + .../scrollbar/qtlabscontrols-scrollbar-handle.qml | 15 + .../qtquickcontrols2-scrollbar-background.qml | 13 - .../qtquickcontrols2-scrollbar-handle.qml | 15 - .../qtlabscontrols-scrollindicator-background.qml | 13 + .../qtlabscontrols-scrollindicator-indicator.qml | 15 + ...qtquickcontrols2-scrollindicator-background.qml | 13 - .../qtquickcontrols2-scrollindicator-indicator.qml | 15 - .../slider/qtlabscontrols-slider-background.qml | 10 + .../data/slider/qtlabscontrols-slider-disabled.qml | 7 + .../data/slider/qtlabscontrols-slider-focused.qml | 7 + .../data/slider/qtlabscontrols-slider-handle.qml | 11 + .../data/slider/qtlabscontrols-slider-normal.qml | 6 + .../data/slider/qtlabscontrols-slider-track.qml | 11 + .../slider/qtquickcontrols2-slider-background.qml | 10 - .../slider/qtquickcontrols2-slider-disabled.qml | 7 - .../slider/qtquickcontrols2-slider-focused.qml | 7 - .../data/slider/qtquickcontrols2-slider-handle.qml | 11 - .../data/slider/qtquickcontrols2-slider-normal.qml | 6 - .../data/slider/qtquickcontrols2-slider-track.qml | 11 - .../switch/qtlabscontrols-switch-background.qml | 10 + .../data/switch/qtlabscontrols-switch-checked.qml | 7 + .../data/switch/qtlabscontrols-switch-disabled.qml | 7 + .../data/switch/qtlabscontrols-switch-focused.qml | 7 + .../switch/qtlabscontrols-switch-indicator.qml | 11 + .../data/switch/qtlabscontrols-switch-label.qml | 11 + .../data/switch/qtlabscontrols-switch-normal.qml | 6 + .../switch/qtquickcontrols2-switch-background.qml | 10 - .../switch/qtquickcontrols2-switch-checked.qml | 7 - .../switch/qtquickcontrols2-switch-disabled.qml | 7 - .../switch/qtquickcontrols2-switch-focused.qml | 7 - .../switch/qtquickcontrols2-switch-indicator.qml | 11 - .../data/switch/qtquickcontrols2-switch-label.qml | 11 - .../data/switch/qtquickcontrols2-switch-normal.qml | 6 - .../qtlabscontrols-textfield-background.qml | 12 + .../qtlabscontrols-textfield-disabled.qml | 8 + .../textfield/qtlabscontrols-textfield-focused.qml | 8 + .../textfield/qtlabscontrols-textfield-normal.qml | 7 + .../qtlabscontrols-textfield-placeholder.qml | 12 + .../qtquickcontrols2-textfield-background.qml | 12 - .../qtquickcontrols2-textfield-disabled.qml | 8 - .../qtquickcontrols2-textfield-focused.qml | 8 - .../qtquickcontrols2-textfield-normal.qml | 7 - .../qtquickcontrols2-textfield-placeholder.qml | 12 - .../toolbar/qtlabscontrols-toolbar-background.qml | 12 + .../data/toolbar/qtlabscontrols-toolbar-frame.qml | 11 + .../qtquickcontrols2-toolbar-background.qml | 12 - .../toolbar/qtquickcontrols2-toolbar-frame.qml | 11 - .../qtlabscontrols-toolbutton-background.qml | 11 + .../toolbutton/qtlabscontrols-toolbutton-label.qml | 11 + .../qtquickcontrols2-toolbutton-background.qml | 11 - .../qtquickcontrols2-toolbutton-label.qml | 11 - .../tumbler/qtlabscontrols-tumbler-background.qml | 12 + .../tumbler/qtlabscontrols-tumbler-contentItem.qml | 12 + .../tumbler/qtlabscontrols-tumbler-delegate.qml | 20 ++ .../qtquickcontrols2-tumbler-background.qml | 12 - .../qtquickcontrols2-tumbler-contentItem.qml | 12 - .../tumbler/qtquickcontrols2-tumbler-delegate.qml | 20 -- tests/benchmarks/creationtime/tst_creationtime.cpp | 4 +- tests/benchmarks/objectcount/tst_objectcount.cpp | 44 +-- tests/manual/fonts/main.qml | 2 +- .../gifs/data/qtlabscontrols-busyindicator.qml | 55 +++ tests/manual/gifs/data/qtlabscontrols-button.qml | 47 +++ tests/manual/gifs/data/qtlabscontrols-slider.qml | 52 +++ tests/manual/gifs/data/qtlabscontrols-switch.qml | 45 +++ tests/manual/gifs/data/qtlabscontrols-tabbar.qml | 56 +++ .../gifs/data/qtlabscontrols-tumbler-wrap.qml | 119 +++++++ .../gifs/data/qtquickcontrols2-busyindicator.qml | 55 --- tests/manual/gifs/data/qtquickcontrols2-button.qml | 47 --- tests/manual/gifs/data/qtquickcontrols2-slider.qml | 52 --- tests/manual/gifs/data/qtquickcontrols2-switch.qml | 45 --- tests/manual/gifs/data/qtquickcontrols2-tabbar.qml | 56 --- .../gifs/data/qtquickcontrols2-tumbler-wrap.qml | 119 ------- tests/manual/gifs/gifrecorder.cpp | 2 +- tests/manual/gifs/tst_gifs.cpp | 12 +- 490 files changed, 3735 insertions(+), 3743 deletions(-) create mode 100644 examples/labs/controls/controls.pro create mode 100644 examples/labs/controls/drawer/drawer.pro create mode 100644 examples/labs/controls/drawer/drawer.qrc create mode 100644 examples/labs/controls/drawer/images/arrow.png create mode 100644 examples/labs/controls/drawer/images/qt-logo.png create mode 100644 examples/labs/controls/drawer/main.cpp create mode 100644 examples/labs/controls/drawer/main.qml create mode 100644 examples/labs/controls/mirroring/main.cpp create mode 100644 examples/labs/controls/mirroring/main.qml create mode 100644 examples/labs/controls/mirroring/mirroring.pro create mode 100644 examples/labs/controls/mirroring/mirroring.qrc create mode 100644 examples/labs/controls/tabs/images/qt-logo.png create mode 100644 examples/labs/controls/tabs/main.cpp create mode 100644 examples/labs/controls/tabs/main.qml create mode 100644 examples/labs/controls/tabs/tabs.pro create mode 100644 examples/labs/controls/tabs/tabs.qrc create mode 100644 examples/labs/controls/theme/main.cpp create mode 100644 examples/labs/controls/theme/main.qml create mode 100644 examples/labs/controls/theme/theme.pro create mode 100644 examples/labs/controls/theme/theme.qrc delete mode 100644 examples/quick/controls/controls.pro delete mode 100644 examples/quick/controls/drawer/drawer.pro delete mode 100644 examples/quick/controls/drawer/drawer.qrc delete mode 100644 examples/quick/controls/drawer/images/arrow.png delete mode 100644 examples/quick/controls/drawer/images/qt-logo.png delete mode 100644 examples/quick/controls/drawer/main.cpp delete mode 100644 examples/quick/controls/drawer/main.qml delete mode 100644 examples/quick/controls/mirroring/main.cpp delete mode 100644 examples/quick/controls/mirroring/main.qml delete mode 100644 examples/quick/controls/mirroring/mirroring.pro delete mode 100644 examples/quick/controls/mirroring/mirroring.qrc delete mode 100644 examples/quick/controls/tabs/images/qt-logo.png delete mode 100644 examples/quick/controls/tabs/main.cpp delete mode 100644 examples/quick/controls/tabs/main.qml delete mode 100644 examples/quick/controls/tabs/tabs.pro delete mode 100644 examples/quick/controls/tabs/tabs.qrc delete mode 100644 examples/quick/controls/theme/main.cpp delete mode 100644 examples/quick/controls/theme/main.qml delete mode 100644 examples/quick/controls/theme/theme.pro delete mode 100644 examples/quick/controls/theme/theme.qrc delete mode 100644 examples/quick/quick.pro 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 create mode 100644 tests/auto/snippets/data/busyindicator/qtlabscontrols-busyindicator-background.qml create mode 100644 tests/auto/snippets/data/busyindicator/qtlabscontrols-busyindicator-indicator.qml delete mode 100644 tests/auto/snippets/data/busyindicator/qtquickcontrols2-busyindicator-background.qml delete mode 100644 tests/auto/snippets/data/busyindicator/qtquickcontrols2-busyindicator-indicator.qml create mode 100644 tests/auto/snippets/data/button/qtlabscontrols-button-background.qml create mode 100644 tests/auto/snippets/data/button/qtlabscontrols-button-disabled.qml create mode 100644 tests/auto/snippets/data/button/qtlabscontrols-button-focused.qml create mode 100644 tests/auto/snippets/data/button/qtlabscontrols-button-label.qml create mode 100644 tests/auto/snippets/data/button/qtlabscontrols-button-normal.qml create mode 100644 tests/auto/snippets/data/button/qtlabscontrols-button-pressed.qml delete mode 100644 tests/auto/snippets/data/button/qtquickcontrols2-button-background.qml delete mode 100644 tests/auto/snippets/data/button/qtquickcontrols2-button-disabled.qml delete mode 100644 tests/auto/snippets/data/button/qtquickcontrols2-button-focused.qml delete mode 100644 tests/auto/snippets/data/button/qtquickcontrols2-button-label.qml delete mode 100644 tests/auto/snippets/data/button/qtquickcontrols2-button-normal.qml delete mode 100644 tests/auto/snippets/data/button/qtquickcontrols2-button-pressed.qml create mode 100644 tests/auto/snippets/data/checkbox/qtlabscontrols-checkbox-background.qml create mode 100644 tests/auto/snippets/data/checkbox/qtlabscontrols-checkbox-checked.qml create mode 100644 tests/auto/snippets/data/checkbox/qtlabscontrols-checkbox-disabled.qml create mode 100644 tests/auto/snippets/data/checkbox/qtlabscontrols-checkbox-focused.qml create mode 100644 tests/auto/snippets/data/checkbox/qtlabscontrols-checkbox-indicator.qml create mode 100644 tests/auto/snippets/data/checkbox/qtlabscontrols-checkbox-label.qml create mode 100644 tests/auto/snippets/data/checkbox/qtlabscontrols-checkbox-normal.qml delete mode 100644 tests/auto/snippets/data/checkbox/qtquickcontrols2-checkbox-background.qml delete mode 100644 tests/auto/snippets/data/checkbox/qtquickcontrols2-checkbox-checked.qml delete mode 100644 tests/auto/snippets/data/checkbox/qtquickcontrols2-checkbox-disabled.qml delete mode 100644 tests/auto/snippets/data/checkbox/qtquickcontrols2-checkbox-focused.qml delete mode 100644 tests/auto/snippets/data/checkbox/qtquickcontrols2-checkbox-indicator.qml delete mode 100644 tests/auto/snippets/data/checkbox/qtquickcontrols2-checkbox-label.qml delete mode 100644 tests/auto/snippets/data/checkbox/qtquickcontrols2-checkbox-normal.qml create mode 100644 tests/auto/snippets/data/dial/qtlabscontrols-dial-background.qml create mode 100644 tests/auto/snippets/data/dial/qtlabscontrols-dial-handle.qml delete mode 100644 tests/auto/snippets/data/dial/qtquickcontrols2-dial-background.qml delete mode 100644 tests/auto/snippets/data/dial/qtquickcontrols2-dial-handle.qml create mode 100644 tests/auto/snippets/data/frame/qtlabscontrols-frame-background.qml create mode 100644 tests/auto/snippets/data/frame/qtlabscontrols-frame-frame.qml delete mode 100644 tests/auto/snippets/data/frame/qtquickcontrols2-frame-background.qml delete mode 100644 tests/auto/snippets/data/frame/qtquickcontrols2-frame-frame.qml create mode 100644 tests/auto/snippets/data/groupbox/qtlabscontrols-groupbox-background.qml create mode 100644 tests/auto/snippets/data/groupbox/qtlabscontrols-groupbox-frame.qml create mode 100644 tests/auto/snippets/data/groupbox/qtlabscontrols-groupbox-label.qml delete mode 100644 tests/auto/snippets/data/groupbox/qtquickcontrols2-groupbox-background.qml delete mode 100644 tests/auto/snippets/data/groupbox/qtquickcontrols2-groupbox-frame.qml delete mode 100644 tests/auto/snippets/data/groupbox/qtquickcontrols2-groupbox-label.qml create mode 100644 tests/auto/snippets/data/progressbar/qtlabscontrols-progressbar-background.qml create mode 100644 tests/auto/snippets/data/progressbar/qtlabscontrols-progressbar-disabled.qml create mode 100644 tests/auto/snippets/data/progressbar/qtlabscontrols-progressbar-indicator.qml create mode 100644 tests/auto/snippets/data/progressbar/qtlabscontrols-progressbar-normal.qml delete mode 100644 tests/auto/snippets/data/progressbar/qtquickcontrols2-progressbar-background.qml delete mode 100644 tests/auto/snippets/data/progressbar/qtquickcontrols2-progressbar-disabled.qml delete mode 100644 tests/auto/snippets/data/progressbar/qtquickcontrols2-progressbar-indicator.qml delete mode 100644 tests/auto/snippets/data/progressbar/qtquickcontrols2-progressbar-normal.qml create mode 100644 tests/auto/snippets/data/radiobutton/qtlabscontrols-radiobutton-background.qml create mode 100644 tests/auto/snippets/data/radiobutton/qtlabscontrols-radiobutton-checked.qml create mode 100644 tests/auto/snippets/data/radiobutton/qtlabscontrols-radiobutton-disabled.qml create mode 100644 tests/auto/snippets/data/radiobutton/qtlabscontrols-radiobutton-focused.qml create mode 100644 tests/auto/snippets/data/radiobutton/qtlabscontrols-radiobutton-indicator.qml create mode 100644 tests/auto/snippets/data/radiobutton/qtlabscontrols-radiobutton-label.qml create mode 100644 tests/auto/snippets/data/radiobutton/qtlabscontrols-radiobutton-normal.qml delete mode 100644 tests/auto/snippets/data/radiobutton/qtquickcontrols2-radiobutton-background.qml delete mode 100644 tests/auto/snippets/data/radiobutton/qtquickcontrols2-radiobutton-checked.qml delete mode 100644 tests/auto/snippets/data/radiobutton/qtquickcontrols2-radiobutton-disabled.qml delete mode 100644 tests/auto/snippets/data/radiobutton/qtquickcontrols2-radiobutton-focused.qml delete mode 100644 tests/auto/snippets/data/radiobutton/qtquickcontrols2-radiobutton-indicator.qml delete mode 100644 tests/auto/snippets/data/radiobutton/qtquickcontrols2-radiobutton-label.qml delete mode 100644 tests/auto/snippets/data/radiobutton/qtquickcontrols2-radiobutton-normal.qml create mode 100644 tests/auto/snippets/data/scrollbar/qtlabscontrols-scrollbar-background.qml create mode 100644 tests/auto/snippets/data/scrollbar/qtlabscontrols-scrollbar-handle.qml delete mode 100644 tests/auto/snippets/data/scrollbar/qtquickcontrols2-scrollbar-background.qml delete mode 100644 tests/auto/snippets/data/scrollbar/qtquickcontrols2-scrollbar-handle.qml create mode 100644 tests/auto/snippets/data/scrollindicator/qtlabscontrols-scrollindicator-background.qml create mode 100644 tests/auto/snippets/data/scrollindicator/qtlabscontrols-scrollindicator-indicator.qml delete mode 100644 tests/auto/snippets/data/scrollindicator/qtquickcontrols2-scrollindicator-background.qml delete mode 100644 tests/auto/snippets/data/scrollindicator/qtquickcontrols2-scrollindicator-indicator.qml create mode 100644 tests/auto/snippets/data/slider/qtlabscontrols-slider-background.qml create mode 100644 tests/auto/snippets/data/slider/qtlabscontrols-slider-disabled.qml create mode 100644 tests/auto/snippets/data/slider/qtlabscontrols-slider-focused.qml create mode 100644 tests/auto/snippets/data/slider/qtlabscontrols-slider-handle.qml create mode 100644 tests/auto/snippets/data/slider/qtlabscontrols-slider-normal.qml create mode 100644 tests/auto/snippets/data/slider/qtlabscontrols-slider-track.qml delete mode 100644 tests/auto/snippets/data/slider/qtquickcontrols2-slider-background.qml delete mode 100644 tests/auto/snippets/data/slider/qtquickcontrols2-slider-disabled.qml delete mode 100644 tests/auto/snippets/data/slider/qtquickcontrols2-slider-focused.qml delete mode 100644 tests/auto/snippets/data/slider/qtquickcontrols2-slider-handle.qml delete mode 100644 tests/auto/snippets/data/slider/qtquickcontrols2-slider-normal.qml delete mode 100644 tests/auto/snippets/data/slider/qtquickcontrols2-slider-track.qml create mode 100644 tests/auto/snippets/data/switch/qtlabscontrols-switch-background.qml create mode 100644 tests/auto/snippets/data/switch/qtlabscontrols-switch-checked.qml create mode 100644 tests/auto/snippets/data/switch/qtlabscontrols-switch-disabled.qml create mode 100644 tests/auto/snippets/data/switch/qtlabscontrols-switch-focused.qml create mode 100644 tests/auto/snippets/data/switch/qtlabscontrols-switch-indicator.qml create mode 100644 tests/auto/snippets/data/switch/qtlabscontrols-switch-label.qml create mode 100644 tests/auto/snippets/data/switch/qtlabscontrols-switch-normal.qml delete mode 100644 tests/auto/snippets/data/switch/qtquickcontrols2-switch-background.qml delete mode 100644 tests/auto/snippets/data/switch/qtquickcontrols2-switch-checked.qml delete mode 100644 tests/auto/snippets/data/switch/qtquickcontrols2-switch-disabled.qml delete mode 100644 tests/auto/snippets/data/switch/qtquickcontrols2-switch-focused.qml delete mode 100644 tests/auto/snippets/data/switch/qtquickcontrols2-switch-indicator.qml delete mode 100644 tests/auto/snippets/data/switch/qtquickcontrols2-switch-label.qml delete mode 100644 tests/auto/snippets/data/switch/qtquickcontrols2-switch-normal.qml create mode 100644 tests/auto/snippets/data/textfield/qtlabscontrols-textfield-background.qml create mode 100644 tests/auto/snippets/data/textfield/qtlabscontrols-textfield-disabled.qml create mode 100644 tests/auto/snippets/data/textfield/qtlabscontrols-textfield-focused.qml create mode 100644 tests/auto/snippets/data/textfield/qtlabscontrols-textfield-normal.qml create mode 100644 tests/auto/snippets/data/textfield/qtlabscontrols-textfield-placeholder.qml delete mode 100644 tests/auto/snippets/data/textfield/qtquickcontrols2-textfield-background.qml delete mode 100644 tests/auto/snippets/data/textfield/qtquickcontrols2-textfield-disabled.qml delete mode 100644 tests/auto/snippets/data/textfield/qtquickcontrols2-textfield-focused.qml delete mode 100644 tests/auto/snippets/data/textfield/qtquickcontrols2-textfield-normal.qml delete mode 100644 tests/auto/snippets/data/textfield/qtquickcontrols2-textfield-placeholder.qml create mode 100644 tests/auto/snippets/data/toolbar/qtlabscontrols-toolbar-background.qml create mode 100644 tests/auto/snippets/data/toolbar/qtlabscontrols-toolbar-frame.qml delete mode 100644 tests/auto/snippets/data/toolbar/qtquickcontrols2-toolbar-background.qml delete mode 100644 tests/auto/snippets/data/toolbar/qtquickcontrols2-toolbar-frame.qml create mode 100644 tests/auto/snippets/data/toolbutton/qtlabscontrols-toolbutton-background.qml create mode 100644 tests/auto/snippets/data/toolbutton/qtlabscontrols-toolbutton-label.qml delete mode 100644 tests/auto/snippets/data/toolbutton/qtquickcontrols2-toolbutton-background.qml delete mode 100644 tests/auto/snippets/data/toolbutton/qtquickcontrols2-toolbutton-label.qml create mode 100644 tests/auto/snippets/data/tumbler/qtlabscontrols-tumbler-background.qml create mode 100644 tests/auto/snippets/data/tumbler/qtlabscontrols-tumbler-contentItem.qml create mode 100644 tests/auto/snippets/data/tumbler/qtlabscontrols-tumbler-delegate.qml delete mode 100644 tests/auto/snippets/data/tumbler/qtquickcontrols2-tumbler-background.qml delete mode 100644 tests/auto/snippets/data/tumbler/qtquickcontrols2-tumbler-contentItem.qml delete mode 100644 tests/auto/snippets/data/tumbler/qtquickcontrols2-tumbler-delegate.qml create mode 100644 tests/manual/gifs/data/qtlabscontrols-busyindicator.qml create mode 100644 tests/manual/gifs/data/qtlabscontrols-button.qml create mode 100644 tests/manual/gifs/data/qtlabscontrols-slider.qml create mode 100644 tests/manual/gifs/data/qtlabscontrols-switch.qml create mode 100644 tests/manual/gifs/data/qtlabscontrols-tabbar.qml create mode 100644 tests/manual/gifs/data/qtlabscontrols-tumbler-wrap.qml delete mode 100644 tests/manual/gifs/data/qtquickcontrols2-busyindicator.qml delete mode 100644 tests/manual/gifs/data/qtquickcontrols2-button.qml delete mode 100644 tests/manual/gifs/data/qtquickcontrols2-slider.qml delete mode 100644 tests/manual/gifs/data/qtquickcontrols2-switch.qml delete mode 100644 tests/manual/gifs/data/qtquickcontrols2-tabbar.qml delete mode 100644 tests/manual/gifs/data/qtquickcontrols2-tumbler-wrap.qml diff --git a/.gitignore b/.gitignore index 0102b172..311c2751 100644 --- a/.gitignore +++ b/.gitignore @@ -6,10 +6,10 @@ /mkspecs /examples/labs/calendar/calendar -/examples/quick/controls/mirroring/mirroring -/examples/quick/controls/theme/theme -/examples/quick/controls/tabs/tabs -/examples/quick/controls/drawer/drawer +/examples/labs/controls/mirroring/mirroring +/examples/labs/controls/theme/theme +/examples/labs/controls/tabs/tabs +/examples/labs/controls/drawer/drawer /tests/auto/accessibility/tst_accessibility /tests/auto/activeFocusOnTab/tst_activeFocusOnTab diff --git a/examples/examples.pro b/examples/examples.pro index e0f52889..29810159 100644 --- a/examples/examples.pro +++ b/examples/examples.pro @@ -1,4 +1,3 @@ TEMPLATE = subdirs SUBDIRS += \ - labs \ - quick + labs diff --git a/examples/labs/calendar/DateTimePicker.qml b/examples/labs/calendar/DateTimePicker.qml index e7b2c227..ab0b3085 100644 --- a/examples/labs/calendar/DateTimePicker.qml +++ b/examples/labs/calendar/DateTimePicker.qml @@ -40,7 +40,7 @@ import QtQuick 2.6 import Qt.labs.calendar 1.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 import Qt.labs.templates 1.0 as T Item { diff --git a/examples/labs/calendar/EventView.qml b/examples/labs/calendar/EventView.qml index 3991e5eb..e47e7486 100644 --- a/examples/labs/calendar/EventView.qml +++ b/examples/labs/calendar/EventView.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Rectangle { border.color: Theme.frameColor diff --git a/examples/labs/calendar/TumblerDelegate.qml b/examples/labs/calendar/TumblerDelegate.qml index fb360cd5..e7d3ee47 100644 --- a/examples/labs/calendar/TumblerDelegate.qml +++ b/examples/labs/calendar/TumblerDelegate.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 import Qt.labs.templates 1.0 as T Text { diff --git a/examples/labs/calendar/main.qml b/examples/labs/calendar/main.qml index d543aeb5..490dc4d1 100644 --- a/examples/labs/calendar/main.qml +++ b/examples/labs/calendar/main.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 import Qt.labs.calendar 1.0 import Qt.labs.templates 1.0 as T import QtQuick.Layouts 1.0 diff --git a/examples/labs/controls/controls.pro b/examples/labs/controls/controls.pro new file mode 100644 index 00000000..950309a6 --- /dev/null +++ b/examples/labs/controls/controls.pro @@ -0,0 +1,6 @@ +TEMPLATE = subdirs +SUBDIRS += \ + mirroring \ + theme \ + tabs \ + drawer diff --git a/examples/labs/controls/drawer/drawer.pro b/examples/labs/controls/drawer/drawer.pro new file mode 100644 index 00000000..02e40200 --- /dev/null +++ b/examples/labs/controls/drawer/drawer.pro @@ -0,0 +1,15 @@ +TEMPLATE = app +TARGET = drawer +QT += quick + +SOURCES += \ + main.cpp + +OTHER_FILES += \ + main.qml + +RESOURCES += \ + drawer.qrc + +target.path = $$[QT_INSTALL_EXAMPLES]/labs/controls/drawer +INSTALLS += target diff --git a/examples/labs/controls/drawer/drawer.qrc b/examples/labs/controls/drawer/drawer.qrc new file mode 100644 index 00000000..25cc5cbe --- /dev/null +++ b/examples/labs/controls/drawer/drawer.qrc @@ -0,0 +1,7 @@ + + + main.qml + images/arrow.png + images/qt-logo.png + + diff --git a/examples/labs/controls/drawer/images/arrow.png b/examples/labs/controls/drawer/images/arrow.png new file mode 100644 index 00000000..4981e0de Binary files /dev/null and b/examples/labs/controls/drawer/images/arrow.png differ diff --git a/examples/labs/controls/drawer/images/qt-logo.png b/examples/labs/controls/drawer/images/qt-logo.png new file mode 100644 index 00000000..cf350dad Binary files /dev/null and b/examples/labs/controls/drawer/images/qt-logo.png differ diff --git a/examples/labs/controls/drawer/main.cpp b/examples/labs/controls/drawer/main.cpp new file mode 100644 index 00000000..2abdc16d --- /dev/null +++ b/examples/labs/controls/drawer/main.cpp @@ -0,0 +1,52 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include +#include + +int main(int argc, char *argv[]) +{ + QGuiApplication app(argc, argv); + QQmlApplicationEngine engine; + engine.load(QUrl("qrc:/main.qml")); + if (engine.rootObjects().isEmpty()) + return -1; + return app.exec(); +} diff --git a/examples/labs/controls/drawer/main.qml b/examples/labs/controls/drawer/main.qml new file mode 100644 index 00000000..5b30a098 --- /dev/null +++ b/examples/labs/controls/drawer/main.qml @@ -0,0 +1,157 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.controls 1.0 + +ApplicationWindow { + id: window + width: 360 + height: 520 + visible: true + title: "Qt Labs Controls - Drawer Example" + + Rectangle { + id: content + anchors.fill: parent + anchors.margins: -1 + border.color: Theme.frameColor + + Image { + width: window.width / 2 + height: window.height / 2 + anchors.centerIn: parent + anchors.horizontalCenterOffset: window.width > window.height ? width / 2 : 0 + anchors.verticalCenterOffset: window.width < window.height ? -height / 4 : 0 + fillMode: Image.PreserveAspectFit + source: "qrc:/images/qt-logo.png" + } + + Image { + width: window.width / 2 + anchors.bottom: parent.bottom + anchors.bottomMargin: height / 2 + fillMode: Image.PreserveAspectFit + source: "qrc:/images/arrow.png" + } + + transform: Translate { + x: effect.current === uncover ? drawer.position * listview.width : + effect.current === push ? drawer.position * listview.width * 0.5 : 0 + } + + z: effect.current === uncover ? 2 : 0 + } + + Drawer { + id: drawer + anchors.fill: parent + + ListView { + id: listview + + width: window.width / 3 * 2 + height: window.height + + ExclusiveGroup { + id: effect + } + + model: VisualItemModel { + Label { + text: "Settings" + x: 6 + width: parent.width - 12 + lineHeight: 2.0 + color: Theme.accentColor + verticalAlignment: Text.AlignVCenter + } + Rectangle { width: parent.width; height: 1; color: Theme.frameColor } + Switch { + id: dim + text: "Dim" + checked: true + width: parent.width + layoutDirection: Qt.RightToLeft + enabled: effect.current != uncover + } + Rectangle { width: parent.width; height: 1; color: Theme.frameColor } + RadioButton { + id: overlay + text: "Overlay" + checked: true + width: parent.width + ExclusiveGroup.group: effect + layoutDirection: Qt.RightToLeft + } + RadioButton { + id: push + text: "Push" + width: parent.width + ExclusiveGroup.group: effect + layoutDirection: Qt.RightToLeft + } + RadioButton { + id: uncover + text: "Uncover" + width: parent.width + ExclusiveGroup.group: effect + layoutDirection: Qt.RightToLeft + } + Rectangle { width: parent.width; height: 1; color: Theme.frameColor } + } + Rectangle { + z: -1 + anchors.fill: parent + anchors.topMargin: -1 + anchors.bottomMargin: -1 + border.color: Theme.frameColor + } + + transform: Translate { + x: effect.current === uncover ? (1.0 - drawer.position) * listview.width : 0 + } + } + + background.visible: dim.checked + + onClicked: close() + } +} diff --git a/examples/labs/controls/mirroring/main.cpp b/examples/labs/controls/mirroring/main.cpp new file mode 100644 index 00000000..2abdc16d --- /dev/null +++ b/examples/labs/controls/mirroring/main.cpp @@ -0,0 +1,52 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include +#include + +int main(int argc, char *argv[]) +{ + QGuiApplication app(argc, argv); + QQmlApplicationEngine engine; + engine.load(QUrl("qrc:/main.qml")); + if (engine.rootObjects().isEmpty()) + return -1; + return app.exec(); +} diff --git a/examples/labs/controls/mirroring/main.qml b/examples/labs/controls/mirroring/main.qml new file mode 100644 index 00000000..835304a8 --- /dev/null +++ b/examples/labs/controls/mirroring/main.qml @@ -0,0 +1,238 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import QtQuick.Layouts 1.0 +import Qt.labs.controls 1.0 +import Qt.labs.templates 1.0 as T + +ApplicationWindow { + id: window + width: 360 + height: 520 + visible: true + title: "Qt Labs Controls - Mirroring Example" + + ListView { + id: listview + anchors.fill: parent + + LayoutMirroring.enabled: headerItem.mirror + LayoutMirroring.childrenInherit: true + + headerPositioning: ListView.PullBackHeader + header: Rectangle { + property alias mirror: mirrorSwitch.checked + + z: 2 + width: parent.width + height: label.implicitHeight + 96 + + Label { + id: label + text: "Beyond the essentials." + color: Theme.accentColor + anchors.fill: parent + anchors.margins: 48 + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + wrapMode: Text.WordWrap + font.pointSize: 26 + } + + Switch { + id: mirrorSwitch + text: "Mirror" + anchors.right: parent.right + anchors.bottom: parent.bottom + layoutDirection: Qt.RightToLeft + LayoutMirroring.enabled: false + } + + Rectangle { + width: parent.width + height: 1 + anchors.bottom: parent.bottom + color: Theme.frameColor + } + } + + model: VisualItemModel { + + Item { width: 1; height: 24 } + + Flow { + id: flow + spacing: 12 + width: Math.min(window.width, window.height) - 24 + anchors.horizontalCenter: parent.horizontalCenter + + GroupBox { + title: "CheckBox" + readonly property real preferredWidth: (flow.width - 12) / 2 + width: window.width > window.height || contentWidth > preferredWidth ? flow.width : preferredWidth + ColumnLayout { + width: parent.width + CheckBox { + width: parent.width + text: "E-mail" + checked: true + } + CheckBox { + width: parent.width + text: "Calendar" + checked: true + } + CheckBox { + width: parent.width + text: "Contacts" + } + } + } + + GroupBox { + title: "RadioButton" + readonly property real preferredWidth: (flow.width - 12) / 2 + width: window.width > window.height || contentWidth > preferredWidth ? flow.width : preferredWidth + ExclusiveGroup { id: eg } + ColumnLayout { + width: parent.width + RadioButton { + width: parent.width + text: "Portrait" + ExclusiveGroup.group: eg + } + RadioButton { + width: parent.width + text: "Landscape" + ExclusiveGroup.group: eg + } + RadioButton { + width: parent.width + text: "Automatic" + checked: true + ExclusiveGroup.group: eg + } + } + } + + GroupBox { + title: "Button" + width: flow.width + Row { + width: parent.width + spacing: 6 + readonly property real availableWidth: (flow.width - 12) / 2 + readonly property real contentWidth: okButton.implicitWidth + cancelButton.implicitWidth + 12 + readonly property real buttonWidth: implicitWidth > availableWidth ? (width / 2 - spacing) : (width / 2 - 2 * spacing) / 2 + Button { + id: okButton + text: "Ok" + width: parent.buttonWidth + } + Button { + id: cancelButton + text: "Cancel" + width: parent.buttonWidth + } + } + } + + GroupBox { + title: "Switch" + width: flow.width + Column { + width: parent.width + Switch { + width: parent.width + text: "Wifi" + checked: true + } + Switch { + width: parent.width + text: "Bluetooth" + } + } + } + + GroupBox { + title: "ProgressBar" + width: flow.width + Column { + width: parent.width + spacing: 6 + ProgressBar { + width: parent.width + indeterminate: true + } + ProgressBar { + width: parent.width + value: slider.position + } + } + } + + GroupBox { + title: "Slider" + width: flow.width + Column { + width: parent.width + spacing: 6 + Slider { + id: slider + value: 0.4 + width: parent.width + } + Slider { + width: parent.width + snapMode: Slider.SnapAlways + stepSize: 0.2 + value: 0.8 + } + } + } + } + + Item { width: 1; height: 12 } + } + + T.ScrollIndicator.vertical: ScrollIndicator { anchors.right: parent.right } + } +} diff --git a/examples/labs/controls/mirroring/mirroring.pro b/examples/labs/controls/mirroring/mirroring.pro new file mode 100644 index 00000000..60b73f94 --- /dev/null +++ b/examples/labs/controls/mirroring/mirroring.pro @@ -0,0 +1,15 @@ +TEMPLATE = app +TARGET = mirroring +QT += quick + +SOURCES += \ + main.cpp + +OTHER_FILES += \ + main.qml + +RESOURCES += \ + mirroring.qrc + +target.path = $$[QT_INSTALL_EXAMPLES]/labs/controls/mirroring +INSTALLS += target diff --git a/examples/labs/controls/mirroring/mirroring.qrc b/examples/labs/controls/mirroring/mirroring.qrc new file mode 100644 index 00000000..5f6483ac --- /dev/null +++ b/examples/labs/controls/mirroring/mirroring.qrc @@ -0,0 +1,5 @@ + + + main.qml + + diff --git a/examples/labs/controls/tabs/images/qt-logo.png b/examples/labs/controls/tabs/images/qt-logo.png new file mode 100644 index 00000000..cf350dad Binary files /dev/null and b/examples/labs/controls/tabs/images/qt-logo.png differ diff --git a/examples/labs/controls/tabs/main.cpp b/examples/labs/controls/tabs/main.cpp new file mode 100644 index 00000000..2abdc16d --- /dev/null +++ b/examples/labs/controls/tabs/main.cpp @@ -0,0 +1,52 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include +#include + +int main(int argc, char *argv[]) +{ + QGuiApplication app(argc, argv); + QQmlApplicationEngine engine; + engine.load(QUrl("qrc:/main.qml")); + if (engine.rootObjects().isEmpty()) + return -1; + return app.exec(); +} diff --git a/examples/labs/controls/tabs/main.qml b/examples/labs/controls/tabs/main.qml new file mode 100644 index 00000000..50fcde16 --- /dev/null +++ b/examples/labs/controls/tabs/main.qml @@ -0,0 +1,291 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import QtQuick.Layouts 1.0 +import Qt.labs.controls 1.0 +import Qt.labs.templates 1.0 as T +import QtQuick.XmlListModel 2.0 + +ApplicationWindow { + id: window + width: 360 + height: 520 + visible: true + title: "Qt Labs Controls - Tabs Example" + + header: TabBar { + id: bar + currentIndex: view.currentIndex + TabButton { + text: "Home" + } + TabButton { + text: "Discover" + } + TabButton { + text: "Activity" + } + } + + SwipeView { + id: view + + spacing: 1 + anchors.fill: parent + currentIndex: bar.currentIndex + background: Rectangle { color: Theme.frameColor } + + Rectangle { + Image { + id: logo + width: window.width / 2 + height: window.height / 2 + anchors.centerIn: parent + fillMode: Image.PreserveAspectFit + source: "qrc:/images/qt-logo.png" + } + + Label { + text: "Things just got better" + color: Theme.accentColor + anchors.margins: 40 + anchors.top: logo.bottom + anchors.left: parent.left + anchors.right: parent.right + anchors.bottom: parent.bottom + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + wrapMode: Text.WordWrap + font.pointSize: 26 + } + } + + Rectangle { + ListView { + anchors.fill: parent + anchors.topMargin: -1 + model: XmlListModel { + id: feedModel + query: "/rss/channel/item" + source: "http://blog.qt.io/feed/" + namespaceDeclarations: "declare namespace dc='http://purl.org/dc/elements/1.1/';" + XmlRole { name: "title"; query: "title/string()" } + XmlRole { name: "link"; query: "link/string()" } + XmlRole { name: "pubDate"; query: "pubDate/string()" } + XmlRole { name: "creator"; query: "dc:creator/string()" } + XmlRole { name: "description"; query: "description/string()" } + } + + delegate: Item { + width: parent.width + height: feedItem.height + Column { + id: feedItem + width: parent.width + spacing: 6 + Rectangle { + width: parent.width + height: 1 + color: Theme.frameColor + visible: index == 0 + } + Item { width: 1; height: 6 } + Label { + text: model.title + x: 6 + width: parent.width - 12 + elide: Text.ElideRight + color: Theme.accentColor + font.pointSize: 20 + lineHeight: 0.75 + } + Label { + text: model.description + textFormat: Text.StyledText + x: 6 + width: parent.width - 12 + wrapMode: Text.WordWrap + } + RowLayout { + x: 6 + width: parent.width - 12 + spacing: 6 + Label { + id: discoverCreator + text: model.creator + height: parent.height + verticalAlignment: Text.AlignVCenter + color: Theme.focusColor + font.pointSize: 8 + } + Label { + text: model.pubDate + height: parent.height + elide: Text.ElideRight + verticalAlignment: Text.AlignVCenter + color: Theme.disabledColor + font.pointSize: 8 + Layout.preferredWidth: parent.width - discoverCreator.width - discoverMore.width - 2 * parent.spacing + visible: Layout.preferredWidth > 0 + } + Button { + id: discoverMore + text: "Read more..." + onClicked: Qt.openUrlExternally(model.link) + } + } + Rectangle { + width: parent.width + height: 1 + color: Theme.frameColor + } + } + } + + T.ScrollIndicator.vertical: ScrollIndicator { } + } + + BusyIndicator { + anchors.centerIn: parent + running: feedModel.status === XmlListModel.Loading + } + } + + Rectangle { + ListView { + anchors.fill: parent + anchors.topMargin: -1 + model: XmlListModel { + id: commentModel + query: "/rss/channel/item" + source: "http://blog.qt.io/comments/feed/" + namespaceDeclarations: "declare namespace dc='http://purl.org/dc/elements/1.1/';" + XmlRole { name: "title"; query: "title/string()" } + XmlRole { name: "link"; query: "link/string()" } + XmlRole { name: "pubDate"; query: "pubDate/string()" } + XmlRole { name: "creator"; query: "dc:creator/string()" } + XmlRole { name: "description"; query: "description/string()" } + } + + delegate: Rectangle { + width: parent.width + height: commentItem.height + Column { + id: commentItem + width: parent.width + spacing: 6 + Rectangle { + width: parent.width + height: 1 + color: Theme.frameColor + visible: index == 0 + } + Item { width: 1; height: 6 } + Label { + text: model.title + x: 6 + width: parent.width - 12 + elide: Text.ElideRight + color: Theme.accentColor + font.pointSize: 14 + lineHeight: 0.75 + } + Item { width: 1; height: 6 } + Label { + text: model.description + textFormat: Text.StyledText + x: 6 + width: parent.width - 12 + wrapMode: Text.WordWrap + } + RowLayout { + x: 6 + width: parent.width - 12 + spacing: 6 + Label { + id: activityCreator + text: model.creator + height: parent.height + verticalAlignment: Text.AlignVCenter + color: Theme.focusColor + font.pointSize: 8 + } + Label { + text: model.pubDate + height: parent.height + elide: Text.ElideRight + verticalAlignment: Text.AlignVCenter + color: Theme.disabledColor + font.pointSize: 8 + Layout.preferredWidth: parent.width - activityCreator.width - activityMore.width - 2 * parent.spacing + visible: Layout.preferredWidth > 0 + } + Button { + id: activityMore + text: "Read more..." + onClicked: Qt.openUrlExternally(model.link) + } + } + Rectangle { + width: parent.width + height: 1 + color: Theme.frameColor + } + } + } + + T.ScrollIndicator.vertical: ScrollIndicator { } + } + + BusyIndicator { + anchors.centerIn: parent + running: feedModel.status === XmlListModel.Loading + } + } + } + + PageIndicator { + count: view.count + currentIndex: view.currentIndex + anchors.bottom: parent.bottom + anchors.horizontalCenter: parent.horizontalCenter + } +} diff --git a/examples/labs/controls/tabs/tabs.pro b/examples/labs/controls/tabs/tabs.pro new file mode 100644 index 00000000..f9b85c1a --- /dev/null +++ b/examples/labs/controls/tabs/tabs.pro @@ -0,0 +1,15 @@ +TEMPLATE = app +TARGET = tabs +QT += quick + +SOURCES += \ + main.cpp + +OTHER_FILES += \ + main.qml + +RESOURCES += \ + tabs.qrc + +target.path = $$[QT_INSTALL_EXAMPLES]/labs/controls/tabs +INSTALLS += target diff --git a/examples/labs/controls/tabs/tabs.qrc b/examples/labs/controls/tabs/tabs.qrc new file mode 100644 index 00000000..b48259b1 --- /dev/null +++ b/examples/labs/controls/tabs/tabs.qrc @@ -0,0 +1,6 @@ + + + main.qml + images/qt-logo.png + + diff --git a/examples/labs/controls/theme/main.cpp b/examples/labs/controls/theme/main.cpp new file mode 100644 index 00000000..2abdc16d --- /dev/null +++ b/examples/labs/controls/theme/main.cpp @@ -0,0 +1,52 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +#include +#include + +int main(int argc, char *argv[]) +{ + QGuiApplication app(argc, argv); + QQmlApplicationEngine engine; + engine.load(QUrl("qrc:/main.qml")); + if (engine.rootObjects().isEmpty()) + return -1; + return app.exec(); +} diff --git a/examples/labs/controls/theme/main.qml b/examples/labs/controls/theme/main.qml new file mode 100644 index 00000000..d3a3f7a0 --- /dev/null +++ b/examples/labs/controls/theme/main.qml @@ -0,0 +1,175 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the examples of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.controls 1.0 +import Qt.labs.templates 1.0 as T + +ApplicationWindow { + id: window + width: 360 + height: 520 + visible: true + title: "Qt Labs Controls - Theme Example" + + header: ToolBar { + ToolButton { + label: Text { + // \u25C0 (black left-pointing triangle is) missing in some fonts + // => use a rotated \u25B2 (black up-pointing triangle) instead + text: "\u25B2" + rotation: -90 + color: enabled ? Theme.accentColor : Theme.frameColor + anchors.centerIn: parent + } + enabled: stackview.depth > 1 + onClicked: stackview.pop() + } + } + + StackView { + id: stackview + anchors.fill: parent + initialItem: pageComponent + } + + Component { + id: pageComponent + Rectangle { + id: page + Theme.accentColor: Qt.hsla(colorSlider.position, 0.5, 0.5, 1.0) + Theme.backgroundColor: darkButton.checked ? "#444" : "#fff" + Theme.frameColor: darkButton.checked ? "#666" : "#ccc" + Theme.textColor: darkButton.checked ? "#eee" : "#111" + Theme.pressColor: darkButton.checked ? "#33ffffff" : "#33333333" + Theme.baseColor: darkButton.checked ? "#444" : "#eee" + color: Theme.backgroundColor + Flickable { + anchors.fill: parent + contentHeight: column.height + 48 + + Column { + id: column + + x: (window.width - width) / 2 + y: 24 + width: window.width / 2 + spacing: 12 + + Label { + text: "Code less. Create more." + color: Theme.accentColor + width: parent.width + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + wrapMode: Text.WordWrap + font.pointSize: 26 + } + + Item { width: 1; height: 48 } + + Rectangle { + width: parent.width + height: 1 + color: Theme.frameColor + } + + Column { + spacing: 6 + width: parent.width + Label { + text: "Accent color" + color: Theme.textColor + } + Slider { + id: colorSlider + width: parent.width + value: 0.275 + } + } + + Rectangle { + width: parent.width + height: 1 + color: Theme.frameColor + } + + ExclusiveGroup { + id: themeGroup + } + + Column { + width: parent.width + spacing: 6 + RadioButton { + id: lightButton + text: "Light" + width: parent.width + checked: true + layoutDirection: Qt.RightToLeft + ExclusiveGroup.group: themeGroup + } + RadioButton { + id: darkButton + text: "Dark" + width: parent.width + layoutDirection: Qt.RightToLeft + ExclusiveGroup.group: themeGroup + } + } + + Rectangle { + width: parent.width + height: 1 + color: Theme.frameColor + } + + Button { + text: "Push" + anchors.right: parent.right + onClicked: stackview.push(pageComponent) + } + } + + T.ScrollIndicator.vertical: ScrollIndicator { } + } + } + } +} diff --git a/examples/labs/controls/theme/theme.pro b/examples/labs/controls/theme/theme.pro new file mode 100644 index 00000000..7672a2cb --- /dev/null +++ b/examples/labs/controls/theme/theme.pro @@ -0,0 +1,15 @@ +TEMPLATE = app +TARGET = theme +QT += quick + +SOURCES += \ + main.cpp + +OTHER_FILES += \ + main.qml + +RESOURCES += \ + theme.qrc + +target.path = $$[QT_INSTALL_EXAMPLES]/labs/controls/theme +INSTALLS += target diff --git a/examples/labs/controls/theme/theme.qrc b/examples/labs/controls/theme/theme.qrc new file mode 100644 index 00000000..5f6483ac --- /dev/null +++ b/examples/labs/controls/theme/theme.qrc @@ -0,0 +1,5 @@ + + + main.qml + + diff --git a/examples/labs/labs.pro b/examples/labs/labs.pro index 88683726..80f94e86 100644 --- a/examples/labs/labs.pro +++ b/examples/labs/labs.pro @@ -1,3 +1,4 @@ TEMPLATE = subdirs SUBDIRS += \ - calendar + calendar \ + controls diff --git a/examples/quick/controls/controls.pro b/examples/quick/controls/controls.pro deleted file mode 100644 index 950309a6..00000000 --- a/examples/quick/controls/controls.pro +++ /dev/null @@ -1,6 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS += \ - mirroring \ - theme \ - tabs \ - drawer diff --git a/examples/quick/controls/drawer/drawer.pro b/examples/quick/controls/drawer/drawer.pro deleted file mode 100644 index 8c128054..00000000 --- a/examples/quick/controls/drawer/drawer.pro +++ /dev/null @@ -1,15 +0,0 @@ -TEMPLATE = app -TARGET = drawer -QT += quick - -SOURCES += \ - main.cpp - -OTHER_FILES += \ - main.qml - -RESOURCES += \ - drawer.qrc - -target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols2/drawer -INSTALLS += target diff --git a/examples/quick/controls/drawer/drawer.qrc b/examples/quick/controls/drawer/drawer.qrc deleted file mode 100644 index 25cc5cbe..00000000 --- a/examples/quick/controls/drawer/drawer.qrc +++ /dev/null @@ -1,7 +0,0 @@ - - - main.qml - images/arrow.png - images/qt-logo.png - - diff --git a/examples/quick/controls/drawer/images/arrow.png b/examples/quick/controls/drawer/images/arrow.png deleted file mode 100644 index 4981e0de..00000000 Binary files a/examples/quick/controls/drawer/images/arrow.png and /dev/null differ diff --git a/examples/quick/controls/drawer/images/qt-logo.png b/examples/quick/controls/drawer/images/qt-logo.png deleted file mode 100644 index cf350dad..00000000 Binary files a/examples/quick/controls/drawer/images/qt-logo.png and /dev/null differ diff --git a/examples/quick/controls/drawer/main.cpp b/examples/quick/controls/drawer/main.cpp deleted file mode 100644 index 2abdc16d..00000000 --- a/examples/quick/controls/drawer/main.cpp +++ /dev/null @@ -1,52 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include - -int main(int argc, char *argv[]) -{ - QGuiApplication app(argc, argv); - QQmlApplicationEngine engine; - engine.load(QUrl("qrc:/main.qml")); - if (engine.rootObjects().isEmpty()) - return -1; - return app.exec(); -} diff --git a/examples/quick/controls/drawer/main.qml b/examples/quick/controls/drawer/main.qml deleted file mode 100644 index 45819e6f..00000000 --- a/examples/quick/controls/drawer/main.qml +++ /dev/null @@ -1,157 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.6 -import QtQuick.Controls 2.0 - -ApplicationWindow { - id: window - width: 360 - height: 520 - visible: true - title: "Qt Quick Controls - Drawer Example" - - Rectangle { - id: content - anchors.fill: parent - anchors.margins: -1 - border.color: Theme.frameColor - - Image { - width: window.width / 2 - height: window.height / 2 - anchors.centerIn: parent - anchors.horizontalCenterOffset: window.width > window.height ? width / 2 : 0 - anchors.verticalCenterOffset: window.width < window.height ? -height / 4 : 0 - fillMode: Image.PreserveAspectFit - source: "qrc:/images/qt-logo.png" - } - - Image { - width: window.width / 2 - anchors.bottom: parent.bottom - anchors.bottomMargin: height / 2 - fillMode: Image.PreserveAspectFit - source: "qrc:/images/arrow.png" - } - - transform: Translate { - x: effect.current === uncover ? drawer.position * listview.width : - effect.current === push ? drawer.position * listview.width * 0.5 : 0 - } - - z: effect.current === uncover ? 2 : 0 - } - - Drawer { - id: drawer - anchors.fill: parent - - ListView { - id: listview - - width: window.width / 3 * 2 - height: window.height - - ExclusiveGroup { - id: effect - } - - model: VisualItemModel { - Label { - text: "Settings" - x: 6 - width: parent.width - 12 - lineHeight: 2.0 - color: Theme.accentColor - verticalAlignment: Text.AlignVCenter - } - Rectangle { width: parent.width; height: 1; color: Theme.frameColor } - Switch { - id: dim - text: "Dim" - checked: true - width: parent.width - layoutDirection: Qt.RightToLeft - enabled: effect.current != uncover - } - Rectangle { width: parent.width; height: 1; color: Theme.frameColor } - RadioButton { - id: overlay - text: "Overlay" - checked: true - width: parent.width - ExclusiveGroup.group: effect - layoutDirection: Qt.RightToLeft - } - RadioButton { - id: push - text: "Push" - width: parent.width - ExclusiveGroup.group: effect - layoutDirection: Qt.RightToLeft - } - RadioButton { - id: uncover - text: "Uncover" - width: parent.width - ExclusiveGroup.group: effect - layoutDirection: Qt.RightToLeft - } - Rectangle { width: parent.width; height: 1; color: Theme.frameColor } - } - Rectangle { - z: -1 - anchors.fill: parent - anchors.topMargin: -1 - anchors.bottomMargin: -1 - border.color: Theme.frameColor - } - - transform: Translate { - x: effect.current === uncover ? (1.0 - drawer.position) * listview.width : 0 - } - } - - background.visible: dim.checked - - onClicked: close() - } -} diff --git a/examples/quick/controls/mirroring/main.cpp b/examples/quick/controls/mirroring/main.cpp deleted file mode 100644 index 2abdc16d..00000000 --- a/examples/quick/controls/mirroring/main.cpp +++ /dev/null @@ -1,52 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include - -int main(int argc, char *argv[]) -{ - QGuiApplication app(argc, argv); - QQmlApplicationEngine engine; - engine.load(QUrl("qrc:/main.qml")); - if (engine.rootObjects().isEmpty()) - return -1; - return app.exec(); -} diff --git a/examples/quick/controls/mirroring/main.qml b/examples/quick/controls/mirroring/main.qml deleted file mode 100644 index 471f3397..00000000 --- a/examples/quick/controls/mirroring/main.qml +++ /dev/null @@ -1,238 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.6 -import QtQuick.Layouts 1.0 -import QtQuick.Controls 2.0 -import Qt.labs.templates 1.0 as T - -ApplicationWindow { - id: window - width: 360 - height: 520 - visible: true - title: "Qt Quick Controls - Mirroring Example" - - ListView { - id: listview - anchors.fill: parent - - LayoutMirroring.enabled: headerItem.mirror - LayoutMirroring.childrenInherit: true - - headerPositioning: ListView.PullBackHeader - header: Rectangle { - property alias mirror: mirrorSwitch.checked - - z: 2 - width: parent.width - height: label.implicitHeight + 96 - - Label { - id: label - text: "Beyond the essentials." - color: Theme.accentColor - anchors.fill: parent - anchors.margins: 48 - horizontalAlignment: Text.AlignHCenter - verticalAlignment: Text.AlignVCenter - wrapMode: Text.WordWrap - font.pointSize: 26 - } - - Switch { - id: mirrorSwitch - text: "Mirror" - anchors.right: parent.right - anchors.bottom: parent.bottom - layoutDirection: Qt.RightToLeft - LayoutMirroring.enabled: false - } - - Rectangle { - width: parent.width - height: 1 - anchors.bottom: parent.bottom - color: Theme.frameColor - } - } - - model: VisualItemModel { - - Item { width: 1; height: 24 } - - Flow { - id: flow - spacing: 12 - width: Math.min(window.width, window.height) - 24 - anchors.horizontalCenter: parent.horizontalCenter - - GroupBox { - title: "CheckBox" - readonly property real preferredWidth: (flow.width - 12) / 2 - width: window.width > window.height || contentWidth > preferredWidth ? flow.width : preferredWidth - ColumnLayout { - width: parent.width - CheckBox { - width: parent.width - text: "E-mail" - checked: true - } - CheckBox { - width: parent.width - text: "Calendar" - checked: true - } - CheckBox { - width: parent.width - text: "Contacts" - } - } - } - - GroupBox { - title: "RadioButton" - readonly property real preferredWidth: (flow.width - 12) / 2 - width: window.width > window.height || contentWidth > preferredWidth ? flow.width : preferredWidth - ExclusiveGroup { id: eg } - ColumnLayout { - width: parent.width - RadioButton { - width: parent.width - text: "Portrait" - ExclusiveGroup.group: eg - } - RadioButton { - width: parent.width - text: "Landscape" - ExclusiveGroup.group: eg - } - RadioButton { - width: parent.width - text: "Automatic" - checked: true - ExclusiveGroup.group: eg - } - } - } - - GroupBox { - title: "Button" - width: flow.width - Row { - width: parent.width - spacing: 6 - readonly property real availableWidth: (flow.width - 12) / 2 - readonly property real contentWidth: okButton.implicitWidth + cancelButton.implicitWidth + 12 - readonly property real buttonWidth: implicitWidth > availableWidth ? (width / 2 - spacing) : (width / 2 - 2 * spacing) / 2 - Button { - id: okButton - text: "Ok" - width: parent.buttonWidth - } - Button { - id: cancelButton - text: "Cancel" - width: parent.buttonWidth - } - } - } - - GroupBox { - title: "Switch" - width: flow.width - Column { - width: parent.width - Switch { - width: parent.width - text: "Wifi" - checked: true - } - Switch { - width: parent.width - text: "Bluetooth" - } - } - } - - GroupBox { - title: "ProgressBar" - width: flow.width - Column { - width: parent.width - spacing: 6 - ProgressBar { - width: parent.width - indeterminate: true - } - ProgressBar { - width: parent.width - value: slider.position - } - } - } - - GroupBox { - title: "Slider" - width: flow.width - Column { - width: parent.width - spacing: 6 - Slider { - id: slider - value: 0.4 - width: parent.width - } - Slider { - width: parent.width - snapMode: Slider.SnapAlways - stepSize: 0.2 - value: 0.8 - } - } - } - } - - Item { width: 1; height: 12 } - } - - T.ScrollIndicator.vertical: ScrollIndicator { anchors.right: parent.right } - } -} diff --git a/examples/quick/controls/mirroring/mirroring.pro b/examples/quick/controls/mirroring/mirroring.pro deleted file mode 100644 index 8086c166..00000000 --- a/examples/quick/controls/mirroring/mirroring.pro +++ /dev/null @@ -1,15 +0,0 @@ -TEMPLATE = app -TARGET = mirroring -QT += quick - -SOURCES += \ - main.cpp - -OTHER_FILES += \ - main.qml - -RESOURCES += \ - mirroring.qrc - -target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols2/mirroring -INSTALLS += target diff --git a/examples/quick/controls/mirroring/mirroring.qrc b/examples/quick/controls/mirroring/mirroring.qrc deleted file mode 100644 index 5f6483ac..00000000 --- a/examples/quick/controls/mirroring/mirroring.qrc +++ /dev/null @@ -1,5 +0,0 @@ - - - main.qml - - diff --git a/examples/quick/controls/tabs/images/qt-logo.png b/examples/quick/controls/tabs/images/qt-logo.png deleted file mode 100644 index cf350dad..00000000 Binary files a/examples/quick/controls/tabs/images/qt-logo.png and /dev/null differ diff --git a/examples/quick/controls/tabs/main.cpp b/examples/quick/controls/tabs/main.cpp deleted file mode 100644 index 2abdc16d..00000000 --- a/examples/quick/controls/tabs/main.cpp +++ /dev/null @@ -1,52 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include - -int main(int argc, char *argv[]) -{ - QGuiApplication app(argc, argv); - QQmlApplicationEngine engine; - engine.load(QUrl("qrc:/main.qml")); - if (engine.rootObjects().isEmpty()) - return -1; - return app.exec(); -} diff --git a/examples/quick/controls/tabs/main.qml b/examples/quick/controls/tabs/main.qml deleted file mode 100644 index cf6093b6..00000000 --- a/examples/quick/controls/tabs/main.qml +++ /dev/null @@ -1,291 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.6 -import QtQuick.Layouts 1.0 -import QtQuick.Controls 2.0 -import Qt.labs.templates 1.0 as T -import QtQuick.XmlListModel 2.0 - -ApplicationWindow { - id: window - width: 360 - height: 520 - visible: true - title: "Qt Quick Controls - Tabs Example" - - header: TabBar { - id: bar - currentIndex: view.currentIndex - TabButton { - text: "Home" - } - TabButton { - text: "Discover" - } - TabButton { - text: "Activity" - } - } - - SwipeView { - id: view - - spacing: 1 - anchors.fill: parent - currentIndex: bar.currentIndex - background: Rectangle { color: Theme.frameColor } - - Rectangle { - Image { - id: logo - width: window.width / 2 - height: window.height / 2 - anchors.centerIn: parent - fillMode: Image.PreserveAspectFit - source: "qrc:/images/qt-logo.png" - } - - Label { - text: "Things just got better" - color: Theme.accentColor - anchors.margins: 40 - anchors.top: logo.bottom - anchors.left: parent.left - anchors.right: parent.right - anchors.bottom: parent.bottom - horizontalAlignment: Text.AlignHCenter - verticalAlignment: Text.AlignVCenter - wrapMode: Text.WordWrap - font.pointSize: 26 - } - } - - Rectangle { - ListView { - anchors.fill: parent - anchors.topMargin: -1 - model: XmlListModel { - id: feedModel - query: "/rss/channel/item" - source: "http://blog.qt.io/feed/" - namespaceDeclarations: "declare namespace dc='http://purl.org/dc/elements/1.1/';" - XmlRole { name: "title"; query: "title/string()" } - XmlRole { name: "link"; query: "link/string()" } - XmlRole { name: "pubDate"; query: "pubDate/string()" } - XmlRole { name: "creator"; query: "dc:creator/string()" } - XmlRole { name: "description"; query: "description/string()" } - } - - delegate: Item { - width: parent.width - height: feedItem.height - Column { - id: feedItem - width: parent.width - spacing: 6 - Rectangle { - width: parent.width - height: 1 - color: Theme.frameColor - visible: index == 0 - } - Item { width: 1; height: 6 } - Label { - text: model.title - x: 6 - width: parent.width - 12 - elide: Text.ElideRight - color: Theme.accentColor - font.pointSize: 20 - lineHeight: 0.75 - } - Label { - text: model.description - textFormat: Text.StyledText - x: 6 - width: parent.width - 12 - wrapMode: Text.WordWrap - } - RowLayout { - x: 6 - width: parent.width - 12 - spacing: 6 - Label { - id: discoverCreator - text: model.creator - height: parent.height - verticalAlignment: Text.AlignVCenter - color: Theme.focusColor - font.pointSize: 8 - } - Label { - text: model.pubDate - height: parent.height - elide: Text.ElideRight - verticalAlignment: Text.AlignVCenter - color: Theme.disabledColor - font.pointSize: 8 - Layout.preferredWidth: parent.width - discoverCreator.width - discoverMore.width - 2 * parent.spacing - visible: Layout.preferredWidth > 0 - } - Button { - id: discoverMore - text: "Read more..." - onClicked: Qt.openUrlExternally(model.link) - } - } - Rectangle { - width: parent.width - height: 1 - color: Theme.frameColor - } - } - } - - T.ScrollIndicator.vertical: ScrollIndicator { } - } - - BusyIndicator { - anchors.centerIn: parent - running: feedModel.status === XmlListModel.Loading - } - } - - Rectangle { - ListView { - anchors.fill: parent - anchors.topMargin: -1 - model: XmlListModel { - id: commentModel - query: "/rss/channel/item" - source: "http://blog.qt.io/comments/feed/" - namespaceDeclarations: "declare namespace dc='http://purl.org/dc/elements/1.1/';" - XmlRole { name: "title"; query: "title/string()" } - XmlRole { name: "link"; query: "link/string()" } - XmlRole { name: "pubDate"; query: "pubDate/string()" } - XmlRole { name: "creator"; query: "dc:creator/string()" } - XmlRole { name: "description"; query: "description/string()" } - } - - delegate: Rectangle { - width: parent.width - height: commentItem.height - Column { - id: commentItem - width: parent.width - spacing: 6 - Rectangle { - width: parent.width - height: 1 - color: Theme.frameColor - visible: index == 0 - } - Item { width: 1; height: 6 } - Label { - text: model.title - x: 6 - width: parent.width - 12 - elide: Text.ElideRight - color: Theme.accentColor - font.pointSize: 14 - lineHeight: 0.75 - } - Item { width: 1; height: 6 } - Label { - text: model.description - textFormat: Text.StyledText - x: 6 - width: parent.width - 12 - wrapMode: Text.WordWrap - } - RowLayout { - x: 6 - width: parent.width - 12 - spacing: 6 - Label { - id: activityCreator - text: model.creator - height: parent.height - verticalAlignment: Text.AlignVCenter - color: Theme.focusColor - font.pointSize: 8 - } - Label { - text: model.pubDate - height: parent.height - elide: Text.ElideRight - verticalAlignment: Text.AlignVCenter - color: Theme.disabledColor - font.pointSize: 8 - Layout.preferredWidth: parent.width - activityCreator.width - activityMore.width - 2 * parent.spacing - visible: Layout.preferredWidth > 0 - } - Button { - id: activityMore - text: "Read more..." - onClicked: Qt.openUrlExternally(model.link) - } - } - Rectangle { - width: parent.width - height: 1 - color: Theme.frameColor - } - } - } - - T.ScrollIndicator.vertical: ScrollIndicator { } - } - - BusyIndicator { - anchors.centerIn: parent - running: feedModel.status === XmlListModel.Loading - } - } - } - - PageIndicator { - count: view.count - currentIndex: view.currentIndex - anchors.bottom: parent.bottom - anchors.horizontalCenter: parent.horizontalCenter - } -} diff --git a/examples/quick/controls/tabs/tabs.pro b/examples/quick/controls/tabs/tabs.pro deleted file mode 100644 index 53423689..00000000 --- a/examples/quick/controls/tabs/tabs.pro +++ /dev/null @@ -1,15 +0,0 @@ -TEMPLATE = app -TARGET = tabs -QT += quick - -SOURCES += \ - main.cpp - -OTHER_FILES += \ - main.qml - -RESOURCES += \ - tabs.qrc - -target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols2/tabs -INSTALLS += target diff --git a/examples/quick/controls/tabs/tabs.qrc b/examples/quick/controls/tabs/tabs.qrc deleted file mode 100644 index b48259b1..00000000 --- a/examples/quick/controls/tabs/tabs.qrc +++ /dev/null @@ -1,6 +0,0 @@ - - - main.qml - images/qt-logo.png - - diff --git a/examples/quick/controls/theme/main.cpp b/examples/quick/controls/theme/main.cpp deleted file mode 100644 index 2abdc16d..00000000 --- a/examples/quick/controls/theme/main.cpp +++ /dev/null @@ -1,52 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -#include -#include - -int main(int argc, char *argv[]) -{ - QGuiApplication app(argc, argv); - QQmlApplicationEngine engine; - engine.load(QUrl("qrc:/main.qml")); - if (engine.rootObjects().isEmpty()) - return -1; - return app.exec(); -} diff --git a/examples/quick/controls/theme/main.qml b/examples/quick/controls/theme/main.qml deleted file mode 100644 index 882b426e..00000000 --- a/examples/quick/controls/theme/main.qml +++ /dev/null @@ -1,175 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the examples of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.6 -import QtQuick.Controls 2.0 -import Qt.labs.templates 1.0 as T - -ApplicationWindow { - id: window - width: 360 - height: 520 - visible: true - title: "Qt Quick Controls - Theme Example" - - header: ToolBar { - ToolButton { - label: Text { - // \u25C0 (black left-pointing triangle is) missing in some fonts - // => use a rotated \u25B2 (black up-pointing triangle) instead - text: "\u25B2" - rotation: -90 - color: enabled ? Theme.accentColor : Theme.frameColor - anchors.centerIn: parent - } - enabled: stackview.depth > 1 - onClicked: stackview.pop() - } - } - - StackView { - id: stackview - anchors.fill: parent - initialItem: pageComponent - } - - Component { - id: pageComponent - Rectangle { - id: page - Theme.accentColor: Qt.hsla(colorSlider.position, 0.5, 0.5, 1.0) - Theme.backgroundColor: darkButton.checked ? "#444" : "#fff" - Theme.frameColor: darkButton.checked ? "#666" : "#ccc" - Theme.textColor: darkButton.checked ? "#eee" : "#111" - Theme.pressColor: darkButton.checked ? "#33ffffff" : "#33333333" - Theme.baseColor: darkButton.checked ? "#444" : "#eee" - color: Theme.backgroundColor - Flickable { - anchors.fill: parent - contentHeight: column.height + 48 - - Column { - id: column - - x: (window.width - width) / 2 - y: 24 - width: window.width / 2 - spacing: 12 - - Label { - text: "Code less. Create more." - color: Theme.accentColor - width: parent.width - horizontalAlignment: Text.AlignHCenter - verticalAlignment: Text.AlignVCenter - wrapMode: Text.WordWrap - font.pointSize: 26 - } - - Item { width: 1; height: 48 } - - Rectangle { - width: parent.width - height: 1 - color: Theme.frameColor - } - - Column { - spacing: 6 - width: parent.width - Label { - text: "Accent color" - color: Theme.textColor - } - Slider { - id: colorSlider - width: parent.width - value: 0.275 - } - } - - Rectangle { - width: parent.width - height: 1 - color: Theme.frameColor - } - - ExclusiveGroup { - id: themeGroup - } - - Column { - width: parent.width - spacing: 6 - RadioButton { - id: lightButton - text: "Light" - width: parent.width - checked: true - layoutDirection: Qt.RightToLeft - ExclusiveGroup.group: themeGroup - } - RadioButton { - id: darkButton - text: "Dark" - width: parent.width - layoutDirection: Qt.RightToLeft - ExclusiveGroup.group: themeGroup - } - } - - Rectangle { - width: parent.width - height: 1 - color: Theme.frameColor - } - - Button { - text: "Push" - anchors.right: parent.right - onClicked: stackview.push(pageComponent) - } - } - - T.ScrollIndicator.vertical: ScrollIndicator { } - } - } - } -} diff --git a/examples/quick/controls/theme/theme.pro b/examples/quick/controls/theme/theme.pro deleted file mode 100644 index 603f4839..00000000 --- a/examples/quick/controls/theme/theme.pro +++ /dev/null @@ -1,15 +0,0 @@ -TEMPLATE = app -TARGET = theme -QT += quick - -SOURCES += \ - main.cpp - -OTHER_FILES += \ - main.qml - -RESOURCES += \ - theme.qrc - -target.path = $$[QT_INSTALL_EXAMPLES]/quickcontrols2/theme -INSTALLS += target diff --git a/examples/quick/controls/theme/theme.qrc b/examples/quick/controls/theme/theme.qrc deleted file mode 100644 index 5f6483ac..00000000 --- a/examples/quick/controls/theme/theme.qrc +++ /dev/null @@ -1,5 +0,0 @@ - - - main.qml - - diff --git a/examples/quick/quick.pro b/examples/quick/quick.pro deleted file mode 100644 index ab3cd2b2..00000000 --- a/examples/quick/quick.pro +++ /dev/null @@ -1,3 +0,0 @@ -TEMPLATE = subdirs -SUBDIRS += \ - controls diff --git a/src/imports/calendar/CalendarView.qml b/src/imports/calendar/CalendarView.qml index 425f4588..bc245ce2 100644 --- a/src/imports/calendar/CalendarView.qml +++ b/src/imports/calendar/CalendarView.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 import Qt.labs.calendar 1.0 AbstractCalendarView { diff --git a/src/imports/calendar/DayOfWeekRow.qml b/src/imports/calendar/DayOfWeekRow.qml index 7f8763d0..6146b688 100644 --- a/src/imports/calendar/DayOfWeekRow.qml +++ b/src/imports/calendar/DayOfWeekRow.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 import Qt.labs.calendar 1.0 AbstractDayOfWeekRow { diff --git a/src/imports/calendar/WeekNumberColumn.qml b/src/imports/calendar/WeekNumberColumn.qml index 27d70636..d5552956 100644 --- a/src/imports/calendar/WeekNumberColumn.qml +++ b/src/imports/calendar/WeekNumberColumn.qml @@ -35,7 +35,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 import Qt.labs.calendar 1.0 AbstractWeekNumberColumn { 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 - - diff --git a/src/templates/qquickabstractbutton.cpp b/src/templates/qquickabstractbutton.cpp index 50f82e45..d431dc78 100644 --- a/src/templates/qquickabstractbutton.cpp +++ b/src/templates/qquickabstractbutton.cpp @@ -43,25 +43,25 @@ QT_BEGIN_NAMESPACE \qmltype AbstractButton \inherits Control \instantiates QQuickAbstractButton - \inqmlmodule QtQuick.Controls + \inqmlmodule Qt.labs.controls \qmlabstract \internal */ /*! - \qmlsignal QtQuick.Controls::AbstractButton::pressed() + \qmlsignal Qt.labs.controls::AbstractButton::pressed() This signal is emitted when the button is interactively pressed by the user. */ /*! - \qmlsignal QtQuick.Controls::AbstractButton::released() + \qmlsignal Qt.labs.controls::AbstractButton::released() This signal is emitted when the button is interactively released by the user. */ /*! - \qmlsignal QtQuick.Controls::AbstractButton::canceled() + \qmlsignal Qt.labs.controls::AbstractButton::canceled() This signal is emitted when the button loses mouse grab while being pressed, or when it would emit the \l released @@ -69,7 +69,7 @@ QT_BEGIN_NAMESPACE */ /*! - \qmlsignal QtQuick.Controls::AbstractButton::clicked() + \qmlsignal Qt.labs.controls::AbstractButton::clicked() This signal is emitted when the button is clicked. */ @@ -95,7 +95,7 @@ QQuickAbstractButton::QQuickAbstractButton(QQuickAbstractButtonPrivate &dd, QQui } /*! - \qmlproperty string QtQuick.Controls::AbstractButton::text + \qmlproperty string Qt.labs.controls::AbstractButton::text This property holds a textual description of the button. @@ -121,7 +121,7 @@ void QQuickAbstractButton::setText(const QString &text) } /*! - \qmlproperty bool QtQuick.Controls::AbstractButton::pressed + \qmlproperty bool Qt.labs.controls::AbstractButton::pressed This property holds whether the button is pressed. */ @@ -142,7 +142,7 @@ void QQuickAbstractButton::setPressed(bool isPressed) } /*! - \qmlproperty Item QtQuick.Controls::AbstractButton::label + \qmlproperty Item Qt.labs.controls::AbstractButton::label This property holds the label item. diff --git a/src/templates/qquickapplicationwindow.cpp b/src/templates/qquickapplicationwindow.cpp index c9a7ffcd..1ff67be6 100644 --- a/src/templates/qquickapplicationwindow.cpp +++ b/src/templates/qquickapplicationwindow.cpp @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE \qmltype ApplicationWindow \inherits Window \instantiates QQuickApplicationWindow - \inqmlmodule QtQuick.Controls + \inqmlmodule Qt.labs.controls \ingroup application \brief Provides a top-level application window. @@ -130,7 +130,7 @@ QQuickApplicationWindow::~QQuickApplicationWindow() } /*! - \qmlproperty Item QtQuick.Controls::ApplicationWindow::header + \qmlproperty Item Qt.labs.controls::ApplicationWindow::header A header item for the window, for example a title bar, menu or tool-bar. By default this property is empty, no header will be shown. @@ -163,7 +163,7 @@ void QQuickApplicationWindow::setHeader(QQuickItem *header) } /*! - \qmlproperty Item QtQuick.Controls::ApplicationWindow::footer + \qmlproperty Item Qt.labs.controls::ApplicationWindow::footer A footer item for the window, for example a status bar or menu. By default this property is empty, no footer will be shown. diff --git a/src/templates/qquickbusyindicator.cpp b/src/templates/qquickbusyindicator.cpp index fb8f56d1..2c8f1f83 100644 --- a/src/templates/qquickbusyindicator.cpp +++ b/src/templates/qquickbusyindicator.cpp @@ -43,11 +43,11 @@ QT_BEGIN_NAMESPACE \qmltype BusyIndicator \inherits Control \instantiates QQuickBusyIndicator - \inqmlmodule QtQuick.Controls + \inqmlmodule Qt.labs.controls \ingroup indicators \brief A busy indicator. - \image qtquickcontrols2-busyindicator.gif + \image qtlabscontrols-busyindicator.gif The busy indicator should be used to indicate activity while content is being loaded or the UI is blocked waiting for a resource to become available. @@ -83,7 +83,7 @@ QQuickBusyIndicator::QQuickBusyIndicator(QQuickItem *parent) : } /*! - \qmlproperty bool QtQuick.Controls::BusyIndicator::running + \qmlproperty bool Qt.labs.controls::BusyIndicator::running This property holds whether the busy indicator is currently indicating activity. @@ -109,7 +109,7 @@ void QQuickBusyIndicator::setRunning(bool running) } /*! - \qmlproperty Item QtQuick.Controls::BusyIndicator::indicator + \qmlproperty Item Qt.labs.controls::BusyIndicator::indicator This property holds the \l[QML]{Item}, which graphically implements the busy indicator. */ diff --git a/src/templates/qquickbutton.cpp b/src/templates/qquickbutton.cpp index 4e3e5010..77638dfe 100644 --- a/src/templates/qquickbutton.cpp +++ b/src/templates/qquickbutton.cpp @@ -43,11 +43,11 @@ QT_BEGIN_NAMESPACE \qmltype Button \inherits AbstractButton \instantiates QQuickButton - \inqmlmodule QtQuick.Controls + \inqmlmodule Qt.labs.controls \ingroup buttons \brief A button control. - \image qtquickcontrols2-button.gif + \image qtlabscontrols-button.gif Button presents a push-button control that can be pushed or clicked by the user. Buttons are normally used to perform an action, or to answer @@ -55,13 +55,13 @@ QT_BEGIN_NAMESPACE \e Yes, \e No, and \e Help. \table - \row \li \image qtquickcontrols2-button-normal.png + \row \li \image qtlabscontrols-button-normal.png \li A button in its normal state. - \row \li \image qtquickcontrols2-button-pressed.png + \row \li \image qtlabscontrols-button-pressed.png \li A button that is pressed. - \row \li \image qtquickcontrols2-button-focused.png + \row \li \image qtlabscontrols-button-focused.png \li A button that has active focus. - \row \li \image qtquickcontrols2-button-disabled.png + \row \li \image qtlabscontrols-button-disabled.png \li A button that is disabled. \endtable diff --git a/src/templates/qquickcheckable.cpp b/src/templates/qquickcheckable.cpp index faff0073..7465c901 100644 --- a/src/templates/qquickcheckable.cpp +++ b/src/templates/qquickcheckable.cpp @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE \qmltype Checkable \inherits AbstractButton \instantiates QQuickCheckable - \inqmlmodule QtQuick.Controls + \inqmlmodule Qt.labs.controls \qmlabstract \internal */ @@ -64,7 +64,7 @@ QQuickCheckable::QQuickCheckable(QQuickCheckablePrivate &dd, QQuickItem *parent) } /*! - \qmlproperty bool QtQuick.Controls::Checkable::checked + \qmlproperty bool Qt.labs.controls::Checkable::checked This property holds whether the control is checked. */ @@ -97,7 +97,7 @@ void QQuickCheckable::setExclusive(bool exclusive) } /*! - \qmlproperty Item QtQuick.Controls::Checkable::indicator + \qmlproperty Item Qt.labs.controls::Checkable::indicator This property holds the indicator item. */ @@ -123,7 +123,7 @@ void QQuickCheckable::setIndicator(QQuickItem *indicator) } /*! - \qmlmethod void QtQuick.Controls::Checkable::toggle() + \qmlmethod void Qt.labs.controls::Checkable::toggle() Toggles the checked state of the control. */ diff --git a/src/templates/qquickcheckbox.cpp b/src/templates/qquickcheckbox.cpp index 29e0dccd..84f7076e 100644 --- a/src/templates/qquickcheckbox.cpp +++ b/src/templates/qquickcheckbox.cpp @@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE \qmltype CheckBox \inherits Checkable \instantiates QQuickCheckBox - \inqmlmodule QtQuick.Controls + \inqmlmodule Qt.labs.controls \ingroup buttons \brief A check box control. @@ -51,13 +51,13 @@ QT_BEGIN_NAMESPACE options from a set of options. \table - \row \li \image qtquickcontrols2-checkbox-normal.png + \row \li \image qtlabscontrols-checkbox-normal.png \li A check box in its normal state. - \row \li \image qtquickcontrols2-checkbox-checked.png + \row \li \image qtlabscontrols-checkbox-checked.png \li A check box that is checked. - \row \li \image qtquickcontrols2-checkbox-focused.png + \row \li \image qtlabscontrols-checkbox-focused.png \li A check box that has active focus. - \row \li \image qtquickcontrols2-checkbox-disabled.png + \row \li \image qtlabscontrols-checkbox-disabled.png \li A check box that is disabled. \endtable diff --git a/src/templates/qquickcontainer.cpp b/src/templates/qquickcontainer.cpp index 4fe8a9d2..d747e55e 100644 --- a/src/templates/qquickcontainer.cpp +++ b/src/templates/qquickcontainer.cpp @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE \qmltype Container \inherits Control \instantiates QQuickContainer - \inqmlmodule QtQuick.Controls + \inqmlmodule Qt.labs.controls \qmlabstract \internal */ @@ -247,7 +247,7 @@ QQuickContainer::~QQuickContainer() } /*! - \qmlproperty int QtQuick.Controls::Container::count + \qmlproperty int Qt.labs.controls::Container::count \readonly This property holds the number of items. @@ -259,7 +259,7 @@ int QQuickContainer::count() const } /*! - \qmlmethod Item QtQuick.Controls::Container::itemAt(int index) + \qmlmethod Item Qt.labs.controls::Container::itemAt(int index) Returns the item at \a index, or \c null if it does not exist. */ @@ -270,7 +270,7 @@ QQuickItem *QQuickContainer::itemAt(int index) const } /*! - \qmlmethod void QtQuick.Controls::Container::addItem(Item item) + \qmlmethod void Qt.labs.controls::Container::addItem(Item item) Adds an \a item. */ @@ -281,7 +281,7 @@ void QQuickContainer::addItem(QQuickItem *item) } /*! - \qmlmethod void QtQuick.Controls::Container::insertItem(int index, Item item) + \qmlmethod void Qt.labs.controls::Container::insertItem(int index, Item item) Inserts an \a item at \a index. */ @@ -306,7 +306,7 @@ void QQuickContainer::insertItem(int index, QQuickItem *item) } /*! - \qmlmethod void QtQuick.Controls::Container::moveItem(int from, int to) + \qmlmethod void Qt.labs.controls::Container::moveItem(int from, int to) Moves an item \a from one index \a to another. */ @@ -324,7 +324,7 @@ void QQuickContainer::moveItem(int from, int to) } /*! - \qmlmethod void QtQuick.Controls::Container::removeItem(int index) + \qmlmethod void Qt.labs.controls::Container::removeItem(int index) Removes an item at \a index. @@ -343,7 +343,7 @@ void QQuickContainer::removeItem(int index) } /*! - \qmlproperty model QtQuick.Controls::Container::contentModel + \qmlproperty model Qt.labs.controls::Container::contentModel \readonly This property holds the content model of items. @@ -355,7 +355,7 @@ QVariant QQuickContainer::contentModel() const } /*! - \qmlproperty list QtQuick.Controls::Container::contentData + \qmlproperty list Qt.labs.controls::Container::contentData \default This property holds the list of content data. @@ -373,7 +373,7 @@ QQmlListProperty QQuickContainer::contentData() } /*! - \qmlproperty list QtQuick.Controls::Container::contentChildren + \qmlproperty list Qt.labs.controls::Container::contentChildren This property holds the list of content children. @@ -390,7 +390,7 @@ QQmlListProperty QQuickContainer::contentChildren() } /*! - \qmlproperty int QtQuick.Controls::Container::currentIndex + \qmlproperty int Qt.labs.controls::Container::currentIndex TODO */ @@ -411,7 +411,7 @@ void QQuickContainer::setCurrentIndex(int index) } /*! - \qmlproperty Item QtQuick.Controls::Container::currentItem + \qmlproperty Item Qt.labs.controls::Container::currentItem TODO */ diff --git a/src/templates/qquickcontrol.cpp b/src/templates/qquickcontrol.cpp index bd45f47b..06a11b13 100644 --- a/src/templates/qquickcontrol.cpp +++ b/src/templates/qquickcontrol.cpp @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE \qmltype Control \inherits Item \instantiates QQuickControl - \inqmlmodule QtQuick.Controls + \inqmlmodule Qt.labs.controls \brief A user interface control. Control is the base type of user interface controls. @@ -335,7 +335,7 @@ void QQuickControl::resetFont() } /*! - \qmlproperty real QtQuick.Controls::Control::availableWidth + \qmlproperty real Qt.labs.controls::Control::availableWidth This property holds the width available after deducting horizontal padding. @@ -347,7 +347,7 @@ qreal QQuickControl::availableWidth() const } /*! - \qmlproperty real QtQuick.Controls::Control::availableHeight + \qmlproperty real Qt.labs.controls::Control::availableHeight This property holds the height available after deducting vertical padding. @@ -359,7 +359,7 @@ qreal QQuickControl::availableHeight() const } /*! - \qmlproperty real QtQuick.Controls::Control::padding + \qmlproperty real Qt.labs.controls::Control::padding This property holds the default padding. @@ -401,7 +401,7 @@ void QQuickControl::resetPadding() } /*! - \qmlproperty real QtQuick.Controls::Control::topPadding + \qmlproperty real Qt.labs.controls::Control::topPadding This property holds the top padding. @@ -428,7 +428,7 @@ void QQuickControl::resetTopPadding() } /*! - \qmlproperty real QtQuick.Controls::Control::leftPadding + \qmlproperty real Qt.labs.controls::Control::leftPadding This property holds the left padding. @@ -455,7 +455,7 @@ void QQuickControl::resetLeftPadding() } /*! - \qmlproperty real QtQuick.Controls::Control::rightPadding + \qmlproperty real Qt.labs.controls::Control::rightPadding This property holds the right padding. @@ -482,7 +482,7 @@ void QQuickControl::resetRightPadding() } /*! - \qmlproperty real QtQuick.Controls::Control::bottomPadding + \qmlproperty real Qt.labs.controls::Control::bottomPadding This property holds the bottom padding. @@ -509,7 +509,7 @@ void QQuickControl::resetBottomPadding() } /*! - \qmlproperty real QtQuick.Controls::Control::spacing + \qmlproperty real Qt.labs.controls::Control::spacing This property holds the spacing. */ @@ -534,7 +534,7 @@ void QQuickControl::resetSpacing() } /*! - \qmlproperty enumeration QtQuick.Controls::Control::layoutDirection + \qmlproperty enumeration Qt.labs.controls::Control::layoutDirection This property holds the layout direction of the control. @@ -555,7 +555,7 @@ Qt::LayoutDirection QQuickControl::layoutDirection() const } /*! - \qmlproperty enumeration QtQuick.Controls::Control::effectiveLayoutDirection + \qmlproperty enumeration Qt.labs.controls::Control::effectiveLayoutDirection \readonly This property holds the effective layout direction of the control. @@ -585,7 +585,7 @@ void QQuickControl::setLayoutDirection(Qt::LayoutDirection direction) } /*! - \qmlproperty bool QtQuick.Controls::Control::mirrored + \qmlproperty bool Qt.labs.controls::Control::mirrored \readonly This property holds whether the control is mirrored. @@ -601,7 +601,7 @@ bool QQuickControl::isMirrored() const } /*! - \qmlproperty Item QtQuick.Controls::Control::background + \qmlproperty Item Qt.labs.controls::Control::background This property holds the background item. @@ -633,7 +633,7 @@ void QQuickControl::setBackground(QQuickItem *background) } /*! - \qmlproperty Item QtQuick.Controls::Control::contentItem + \qmlproperty Item Qt.labs.controls::Control::contentItem TODO */ diff --git a/src/templates/qquickdial.cpp b/src/templates/qquickdial.cpp index c1c0cc20..f2f54a50 100644 --- a/src/templates/qquickdial.cpp +++ b/src/templates/qquickdial.cpp @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE \qmltype Dial \inherits Control \instantiates QQuickDial - \inqmlmodule QtQuick.Controls + \inqmlmodule Qt.labs.controls \ingroup sliders \brief A circular dial that is rotated to set a value. @@ -168,7 +168,7 @@ QQuickDial::QQuickDial(QQuickItem *parent) : } /*! - \qmlproperty real QtQuick.Controls::Dial::from + \qmlproperty real Qt.labs.controls::Dial::from This property holds the starting value for the range. The default value is \c 0.0. @@ -194,7 +194,7 @@ void QQuickDial::setFrom(qreal from) } /*! - \qmlproperty real QtQuick.Controls::Dial::to + \qmlproperty real Qt.labs.controls::Dial::to This property holds the end value for the range. The default value is \c 1.0. @@ -221,7 +221,7 @@ void QQuickDial::setTo(qreal to) } /*! - \qmlproperty real QtQuick.Controls::Dial::value + \qmlproperty real Qt.labs.controls::Dial::value This property holds the value in the range \c from - \c to. The default value is \c 0.0. @@ -252,7 +252,7 @@ void QQuickDial::setValue(qreal value) } /*! - \qmlproperty real QtQuick.Controls::Dial::position + \qmlproperty real Qt.labs.controls::Dial::position This property holds the logical position of the handle. @@ -270,7 +270,7 @@ qreal QQuickDial::position() const } /*! - \qmlproperty real QtQuick.Controls::Dial::angle \readonly + \qmlproperty real Qt.labs.controls::Dial::angle \readonly This property holds the angle of the handle. @@ -286,7 +286,7 @@ qreal QQuickDial::angle() const } /*! - \qmlproperty real QtQuick.Controls::Dial::stepSize + \qmlproperty real Qt.labs.controls::Dial::stepSize This property holds the step size. The default value is \c 0.0. @@ -308,7 +308,7 @@ void QQuickDial::setStepSize(qreal step) } /*! - \qmlproperty enumeration QtQuick.Controls::Dial::snapMode + \qmlproperty enumeration Qt.labs.controls::Dial::snapMode This property holds the snap mode. @@ -340,7 +340,7 @@ void QQuickDial::setSnapMode(SnapMode mode) } /*! - \qmlproperty bool QtQuick.Controls::Dial::pressed + \qmlproperty bool Qt.labs.controls::Dial::pressed This property holds whether the dial is pressed. @@ -374,7 +374,7 @@ void QQuickDial::setPressed(bool pressed) } /*! - \qmlmethod void QtQuick.Controls::Dial::increase() + \qmlmethod void Qt.labs.controls::Dial::increase() Increases the value by \l stepSize, or \c 0.1 if stepSize is not defined. @@ -388,7 +388,7 @@ void QQuickDial::increase() } /*! - \qmlmethod void QtQuick.Controls::Dial::decrease() + \qmlmethod void Qt.labs.controls::Dial::decrease() Decreases the value by \l stepSize, or \c 0.1 if stepSize is not defined. @@ -402,7 +402,7 @@ void QQuickDial::decrease() } /*! - \qmlproperty component QtQuick.Controls::Dial::handle + \qmlproperty component Qt.labs.controls::Dial::handle This property holds the handle of the dial. diff --git a/src/templates/qquickexclusivegroup.cpp b/src/templates/qquickexclusivegroup.cpp index 8ac6d3b4..aa3cbf16 100644 --- a/src/templates/qquickexclusivegroup.cpp +++ b/src/templates/qquickexclusivegroup.cpp @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE \qmltype ExclusiveGroup \inherits QtObject \instantiates QQuickExclusiveGroup - \inqmlmodule QtQuick.Controls + \inqmlmodule Qt.labs.controls \ingroup utilities \brief An exclusive group of checkable controls. @@ -221,7 +221,7 @@ QQuickExclusiveGroupAttached *QQuickExclusiveGroup::qmlAttachedProperties(QObjec } /*! - \qmlproperty QtObject QtQuick.Controls::ExclusiveGroup::current + \qmlproperty QtObject Qt.labs.controls::ExclusiveGroup::current This property holds the currently selected object or \c null if there is none. @@ -247,7 +247,7 @@ void QQuickExclusiveGroup::setCurrent(QObject *current) } /*! - \qmlproperty list QtQuick.Controls::ExclusiveGroup::checkables + \qmlproperty list Qt.labs.controls::ExclusiveGroup::checkables \default This property holds the list of checkables. @@ -284,7 +284,7 @@ QQmlListProperty QQuickExclusiveGroup::checkables() } /*! - \qmlmethod void QtQuick.Controls::ExclusiveGroup::addCheckable(QtObject object) + \qmlmethod void Qt.labs.controls::ExclusiveGroup::addCheckable(QtObject object) Adds an \a object to the exclusive group. @@ -316,7 +316,7 @@ void QQuickExclusiveGroup::addCheckable(QObject *object) } /*! - \qmlmethod void QtQuick.Controls::ExclusiveGroup::removeCheckable(QtObject object) + \qmlmethod void Qt.labs.controls::ExclusiveGroup::removeCheckable(QtObject object) Removes an \a object from the exclusive group. @@ -359,7 +359,7 @@ QQuickExclusiveGroupAttached::QQuickExclusiveGroupAttached(QObject *parent) : } /*! - \qmlattachedproperty ExclusiveGroup QtQuick.Controls::ExclusiveGroup::group + \qmlattachedproperty ExclusiveGroup Qt.labs.controls::ExclusiveGroup::group This property attaches a checkable control or object to an exclusive group. diff --git a/src/templates/qquickframe.cpp b/src/templates/qquickframe.cpp index 824b7b56..743514c1 100644 --- a/src/templates/qquickframe.cpp +++ b/src/templates/qquickframe.cpp @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE \qmltype Frame \inherits Control \instantiates QQuickFrame - \inqmlmodule QtQuick.Controls + \inqmlmodule Qt.labs.controls \ingroup containers \brief A frame control. @@ -87,7 +87,7 @@ QQuickFrame::QQuickFrame(QQuickFramePrivate &dd, QQuickItem *parent) : } /*! - \qmlproperty real QtQuick.Controls::Frame::contentWidth + \qmlproperty real Qt.labs.controls::Frame::contentWidth This property holds the content width. It is used for calculating the total implicit width of the frame. @@ -111,7 +111,7 @@ void QQuickFrame::setContentWidth(qreal width) } /*! - \qmlproperty real QtQuick.Controls::Frame::contentHeight + \qmlproperty real Qt.labs.controls::Frame::contentHeight This property holds the content height. It is used for calculating the total implicit height of the frame. @@ -135,7 +135,7 @@ void QQuickFrame::setContentHeight(qreal height) } /*! - \qmlproperty Item QtQuick.Controls::Frame::frame + \qmlproperty Item Qt.labs.controls::Frame::frame This property holds the visual frame item. @@ -160,7 +160,7 @@ void QQuickFrame::setFrame(QQuickItem *frame) } /*! - \qmlproperty list QtQuick.Controls::Frame::contentData + \qmlproperty list Qt.labs.controls::Frame::contentData \default This property holds the list of content data. @@ -178,7 +178,7 @@ QQmlListProperty QQuickFrame::contentData() } /*! - \qmlproperty list QtQuick.Controls::Frame::contentChildren + \qmlproperty list Qt.labs.controls::Frame::contentChildren This property holds the list of content children. diff --git a/src/templates/qquickgroupbox.cpp b/src/templates/qquickgroupbox.cpp index 735b7e05..30cede12 100644 --- a/src/templates/qquickgroupbox.cpp +++ b/src/templates/qquickgroupbox.cpp @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE \qmltype GroupBox \inherits Frame \instantiates QQuickGroupBox - \inqmlmodule QtQuick.Controls + \inqmlmodule Qt.labs.controls \ingroup containers \brief A group box control. @@ -88,7 +88,7 @@ QQuickGroupBox::QQuickGroupBox(QQuickItem *parent) : } /*! - \qmlproperty string QtQuick.Controls::GroupBox::title + \qmlproperty string Qt.labs.controls::GroupBox::title This property holds the title. */ @@ -108,7 +108,7 @@ void QQuickGroupBox::setTitle(const QString &title) } /*! - \qmlproperty Item QtQuick.Controls::GroupBox::label + \qmlproperty Item Qt.labs.controls::GroupBox::label This property holds the label item that visualizes \l title. diff --git a/src/templates/qquickpageindicator.cpp b/src/templates/qquickpageindicator.cpp index 3f5d9c9e..c3660cf4 100644 --- a/src/templates/qquickpageindicator.cpp +++ b/src/templates/qquickpageindicator.cpp @@ -43,7 +43,7 @@ QT_BEGIN_NAMESPACE \qmltype PageIndicator \inherits Control \instantiates QQuickPageIndicator - \inqmlmodule QtQuick.Controls + \inqmlmodule Qt.labs.controls \ingroup indicators \brief A page indicator control. @@ -122,7 +122,7 @@ QQuickPageIndicator::QQuickPageIndicator(QQuickItem *parent) : } /*! - \qmlproperty int QtQuick.Controls::PageIndicator::count + \qmlproperty int Qt.labs.controls::PageIndicator::count This property holds the number of pages. */ @@ -142,7 +142,7 @@ void QQuickPageIndicator::setCount(int count) } /*! - \qmlproperty int QtQuick.Controls::PageIndicator::currentIndex + \qmlproperty int Qt.labs.controls::PageIndicator::currentIndex This property holds the index of the current page. */ @@ -162,7 +162,7 @@ void QQuickPageIndicator::setCurrentIndex(int index) } /*! - \qmlproperty bool QtQuick.Controls::PageIndicator::interactive + \qmlproperty bool Qt.labs.controls::PageIndicator::interactive This property holds whether the control is interactive. An interactive page indicator reacts to presses and automatically changes the \l {currentIndex}{current index} @@ -187,7 +187,7 @@ void QQuickPageIndicator::setInteractive(bool interactive) } /*! - \qmlproperty Component QtQuick.Controls::PageIndicator::delegate + \qmlproperty Component Qt.labs.controls::PageIndicator::delegate This property holds a delegate that presents a page. @@ -215,7 +215,7 @@ void QQuickPageIndicator::setDelegate(QQmlComponent *delegate) } /*! - \qmlproperty color QtQuick.Controls::PageIndicator::color + \qmlproperty color Qt.labs.controls::PageIndicator::color This property holds the color of the indicator. diff --git a/src/templates/qquickprogressbar.cpp b/src/templates/qquickprogressbar.cpp index 5ce7894b..a0dc2779 100644 --- a/src/templates/qquickprogressbar.cpp +++ b/src/templates/qquickprogressbar.cpp @@ -43,16 +43,16 @@ QT_BEGIN_NAMESPACE \qmltype ProgressBar \inherits Control \instantiates QQuickProgressBar - \inqmlmodule QtQuick.Controls + \inqmlmodule Qt.labs.controls \ingroup indicators \brief A progress bar control. ProgressBar indicates the progress of an operation. \table - \row \li \image qtquickcontrols2-progressbar-normal.png + \row \li \image qtlabscontrols-progressbar-normal.png \li A progress bar in its normal state. - \row \li \image qtquickcontrols2-progressbar-disabled.png + \row \li \image qtlabscontrols-progressbar-disabled.png \li A progress bar that is disabled. \endtable @@ -84,7 +84,7 @@ QQuickProgressBar::QQuickProgressBar(QQuickItem *parent) : } /*! - \qmlproperty real QtQuick.Controls::ProgressBar::from + \qmlproperty real Qt.labs.controls::ProgressBar::from This property holds the starting value for the progress. The default value is \c 0.0. @@ -110,7 +110,7 @@ void QQuickProgressBar::setFrom(qreal from) } /*! - \qmlproperty real QtQuick.Controls::ProgressBar::to + \qmlproperty real Qt.labs.controls::ProgressBar::to This property holds the end value for the progress. The default value is \c 1.0. @@ -136,7 +136,7 @@ void QQuickProgressBar::setTo(qreal to) } /*! - \qmlproperty real QtQuick.Controls::ProgressBar::value + \qmlproperty real Qt.labs.controls::ProgressBar::value This property holds the progress value. The default value is \c 0.0. @@ -163,7 +163,7 @@ void QQuickProgressBar::setValue(qreal value) } /*! - \qmlproperty real QtQuick.Controls::ProgressBar::position + \qmlproperty real Qt.labs.controls::ProgressBar::position \readonly This property holds the logical position of the progress. @@ -183,7 +183,7 @@ qreal QQuickProgressBar::position() const } /*! - \qmlproperty real QtQuick.Controls::ProgressBar::visualPosition + \qmlproperty real Qt.labs.controls::ProgressBar::visualPosition \readonly This property holds the visual position of the progress. @@ -203,7 +203,7 @@ qreal QQuickProgressBar::visualPosition() const } /*! - \qmlproperty bool QtQuick.Controls::ProgressBar::indeterminate + \qmlproperty bool Qt.labs.controls::ProgressBar::indeterminate This property holds whether the progress bar is in an indeterminate mode. */ @@ -223,7 +223,7 @@ void QQuickProgressBar::setIndeterminate(bool indeterminate) } /*! - \qmlproperty Item QtQuick.Controls::ProgressBar::indicator + \qmlproperty Item Qt.labs.controls::ProgressBar::indicator This property holds the indicator item. diff --git a/src/templates/qquickradiobutton.cpp b/src/templates/qquickradiobutton.cpp index 6a2ca887..70aed7e2 100644 --- a/src/templates/qquickradiobutton.cpp +++ b/src/templates/qquickradiobutton.cpp @@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE \qmltype RadioButton \inherits Checkable \instantiates QQuickRadioButton - \inqmlmodule QtQuick.Controls + \inqmlmodule Qt.labs.controls \ingroup buttons \brief A radio button control. @@ -51,13 +51,13 @@ QT_BEGIN_NAMESPACE from a set of options. \table - \row \li \image qtquickcontrols2-radiobutton-normal.png + \row \li \image qtlabscontrols-radiobutton-normal.png \li A radio button in its normal state. - \row \li \image qtquickcontrols2-radiobutton-checked.png + \row \li \image qtlabscontrols-radiobutton-checked.png \li A radio button that is checked. - \row \li \image qtquickcontrols2-radiobutton-focused.png + \row \li \image qtlabscontrols-radiobutton-focused.png \li A radio button that has active focus. - \row \li \image qtquickcontrols2-radiobutton-disabled.png + \row \li \image qtlabscontrols-radiobutton-disabled.png \li A radio button that is disabled. \endtable diff --git a/src/templates/qquickscrollbar.cpp b/src/templates/qquickscrollbar.cpp index 8f194911..e21b613b 100644 --- a/src/templates/qquickscrollbar.cpp +++ b/src/templates/qquickscrollbar.cpp @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE \qmltype ScrollBar \inherits Control \instantiates QQuickScrollBar - \inqmlmodule QtQuick.Controls + \inqmlmodule Qt.labs.controls \ingroup indicators \ingroup sliders \brief An interactive scroll bar control. @@ -119,7 +119,7 @@ QQuickScrollBarAttached *QQuickScrollBar::qmlAttachedProperties(QObject *object) } /*! - \qmlproperty real QtQuick.Controls::ScrollBar::size + \qmlproperty real Qt.labs.controls::ScrollBar::size This property holds the size of the scroll bar, scaled to \c {0.0 - 1.0}. @@ -141,7 +141,7 @@ void QQuickScrollBar::setSize(qreal size) } /*! - \qmlproperty real QtQuick.Controls::ScrollBar::position + \qmlproperty real Qt.labs.controls::ScrollBar::position This property holds the position of the scroll bar, scaled to \c {0.0 - 1.0}. @@ -163,7 +163,7 @@ void QQuickScrollBar::setPosition(qreal position) } /*! - \qmlproperty bool QtQuick.Controls::ScrollBar::active + \qmlproperty bool Qt.labs.controls::ScrollBar::active This property holds whether the scroll bar is active ie. when its \l pressed or the attached Flickable is \l {Flickable::moving}{moving}. @@ -184,7 +184,7 @@ void QQuickScrollBar::setActive(bool active) } /*! - \qmlproperty bool QtQuick.Controls::ScrollBar::pressed + \qmlproperty bool Qt.labs.controls::ScrollBar::pressed This property holds whether the scroll bar is pressed. */ @@ -206,7 +206,7 @@ void QQuickScrollBar::setPressed(bool pressed) } /*! - \qmlproperty enumeration QtQuick.Controls::ScrollBar::orientation + \qmlproperty enumeration Qt.labs.controls::ScrollBar::orientation This property holds the orientation of the scroll bar. @@ -232,7 +232,7 @@ void QQuickScrollBar::setOrientation(Qt::Orientation orientation) } /*! - \qmlproperty Item QtQuick.Controls::ScrollBar::handle + \qmlproperty Item Qt.labs.controls::ScrollBar::handle This property holds the handle item. @@ -383,7 +383,7 @@ QQuickScrollBarAttached::QQuickScrollBarAttached(QQuickFlickable *flickable) : } /*! - \qmlattachedproperty ScrollBar QtQuick.Controls::ScrollBar::horizontal + \qmlattachedproperty ScrollBar Qt.labs.controls::ScrollBar::horizontal This property attaches a horizontal scroll bar to a \l Flickable. @@ -437,7 +437,7 @@ void QQuickScrollBarAttached::setHorizontal(QQuickScrollBar *horizontal) } /*! - \qmlattachedproperty ScrollBar QtQuick.Controls::ScrollBar::vertical + \qmlattachedproperty ScrollBar Qt.labs.controls::ScrollBar::vertical This property attaches a vertical scroll bar to a \l Flickable. diff --git a/src/templates/qquickscrollindicator.cpp b/src/templates/qquickscrollindicator.cpp index 201513c1..a1979798 100644 --- a/src/templates/qquickscrollindicator.cpp +++ b/src/templates/qquickscrollindicator.cpp @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE \qmltype ScrollIndicator \inherits Control \instantiates QQuickScrollIndicator - \inqmlmodule QtQuick.Controls + \inqmlmodule Qt.labs.controls \ingroup indicators \brief A non-interactive scroll indicator control. @@ -107,7 +107,7 @@ QQuickScrollIndicatorAttached *QQuickScrollIndicator::qmlAttachedProperties(QObj } /*! - \qmlproperty real QtQuick.Controls::ScrollIndicator::size + \qmlproperty real Qt.labs.controls::ScrollIndicator::size This property holds the size of the indicator, scaled to \c {0.0 - 1.0}. @@ -129,7 +129,7 @@ void QQuickScrollIndicator::setSize(qreal size) } /*! - \qmlproperty real QtQuick.Controls::ScrollIndicator::position + \qmlproperty real Qt.labs.controls::ScrollIndicator::position This property holds the position of the indicator, scaled to \c {0.0 - 1.0}. @@ -151,7 +151,7 @@ void QQuickScrollIndicator::setPosition(qreal position) } /*! - \qmlproperty bool QtQuick.Controls::ScrollIndicator::active + \qmlproperty bool Qt.labs.controls::ScrollIndicator::active This property holds whether the indicator is active, that is, when the attached Flickable is \l {Flickable::moving}{moving}. @@ -172,7 +172,7 @@ void QQuickScrollIndicator::setActive(bool active) } /*! - \qmlproperty enumeration QtQuick.Controls::ScrollIndicator::orientation + \qmlproperty enumeration Qt.labs.controls::ScrollIndicator::orientation This property holds the orientation of the indicator. @@ -198,7 +198,7 @@ void QQuickScrollIndicator::setOrientation(Qt::Orientation orientation) } /*! - \qmlproperty Item QtQuick.Controls::ScrollIndicator::indicator + \qmlproperty Item Qt.labs.controls::ScrollIndicator::indicator This property holds the indicator item. @@ -280,7 +280,7 @@ QQuickScrollIndicatorAttached::QQuickScrollIndicatorAttached(QQuickFlickable *fl } /*! - \qmlattachedproperty ScrollIndicator QtQuick.Controls::ScrollIndicator::horizontal + \qmlattachedproperty ScrollIndicator Qt.labs.controls::ScrollIndicator::horizontal This property attaches a horizontal scroll indicator to a \l Flickable. @@ -332,7 +332,7 @@ void QQuickScrollIndicatorAttached::setHorizontal(QQuickScrollIndicator *horizon } /*! - \qmlattachedproperty ScrollIndicator QtQuick.Controls::ScrollIndicator::vertical + \qmlattachedproperty ScrollIndicator Qt.labs.controls::ScrollIndicator::vertical This property attaches a vertical scroll indicator to a \l Flickable. diff --git a/src/templates/qquickslider.cpp b/src/templates/qquickslider.cpp index ecd8a4ea..dcac1799 100644 --- a/src/templates/qquickslider.cpp +++ b/src/templates/qquickslider.cpp @@ -45,20 +45,20 @@ QT_BEGIN_NAMESPACE \qmltype Slider \inherits Control \instantiates QQuickSlider - \inqmlmodule QtQuick.Controls + \inqmlmodule Qt.labs.controls \ingroup sliders \brief A slider control. - \image qtquickcontrols2-slider.gif + \image qtlabscontrols-slider.gif Slider is used to select a value by sliding a handle along a track. \table - \row \li \image qtquickcontrols2-slider-normal.png + \row \li \image qtlabscontrols-slider-normal.png \li A slider in its normal state. - \row \li \image qtquickcontrols2-slider-focused.png + \row \li \image qtlabscontrols-slider-focused.png \li A slider that has active focus. - \row \li \image qtquickcontrols2-slider-disabled.png + \row \li \image qtlabscontrols-slider-disabled.png \li A slider that is disabled. \endtable @@ -162,7 +162,7 @@ QQuickSlider::QQuickSlider(QQuickItem *parent) : } /*! - \qmlproperty real QtQuick.Controls::Slider::from + \qmlproperty real Qt.labs.controls::Slider::from This property holds the starting value for the range. The default value is \c 0.0. @@ -188,7 +188,7 @@ void QQuickSlider::setFrom(qreal from) } /*! - \qmlproperty real QtQuick.Controls::Slider::to + \qmlproperty real Qt.labs.controls::Slider::to This property holds the end value for the range. The default value is \c 1.0. @@ -214,7 +214,7 @@ void QQuickSlider::setTo(qreal to) } /*! - \qmlproperty real QtQuick.Controls::Slider::value + \qmlproperty real Qt.labs.controls::Slider::value This property holds the value in the range \c from - \c to. The default value is \c 0.0. @@ -244,7 +244,7 @@ void QQuickSlider::setValue(qreal value) } /*! - \qmlproperty real QtQuick.Controls::Slider::position + \qmlproperty real Qt.labs.controls::Slider::position This property holds the logical position of the handle. @@ -262,7 +262,7 @@ qreal QQuickSlider::position() const } /*! - \qmlproperty real QtQuick.Controls::Slider::visualPosition + \qmlproperty real Qt.labs.controls::Slider::visualPosition \readonly This property holds the visual position of the handle. @@ -283,7 +283,7 @@ qreal QQuickSlider::visualPosition() const } /*! - \qmlproperty real QtQuick.Controls::Slider::stepSize + \qmlproperty real Qt.labs.controls::Slider::stepSize This property holds the step size. The default value is \c 0.0. @@ -305,7 +305,7 @@ void QQuickSlider::setStepSize(qreal step) } /*! - \qmlproperty enumeration QtQuick.Controls::Slider::snapMode + \qmlproperty enumeration Qt.labs.controls::Slider::snapMode This property holds the snap mode. @@ -334,7 +334,7 @@ void QQuickSlider::setSnapMode(SnapMode mode) } /*! - \qmlproperty bool QtQuick.Controls::Slider::pressed + \qmlproperty bool Qt.labs.controls::Slider::pressed This property holds whether the slider is pressed. */ @@ -355,7 +355,7 @@ void QQuickSlider::setPressed(bool pressed) } /*! - \qmlproperty enumeration QtQuick.Controls::Slider::orientation + \qmlproperty enumeration Qt.labs.controls::Slider::orientation This property holds the orientation. @@ -381,7 +381,7 @@ void QQuickSlider::setOrientation(Qt::Orientation orientation) } /*! - \qmlproperty Item QtQuick.Controls::Slider::handle + \qmlproperty Item Qt.labs.controls::Slider::handle This property holds the handle item. @@ -406,7 +406,7 @@ void QQuickSlider::setHandle(QQuickItem *handle) } /*! - \qmlproperty Item QtQuick.Controls::Slider::track + \qmlproperty Item Qt.labs.controls::Slider::track This property holds the track item. @@ -431,7 +431,7 @@ void QQuickSlider::setTrack(QQuickItem *track) } /*! - \qmlmethod void QtQuick.Controls::Slider::increase() + \qmlmethod void Qt.labs.controls::Slider::increase() Increases the value by \l stepSize or \c 0.1 if stepSize is not defined. @@ -445,7 +445,7 @@ void QQuickSlider::increase() } /*! - \qmlmethod void QtQuick.Controls::Slider::decrease() + \qmlmethod void Qt.labs.controls::Slider::decrease() Decreases the value by \l stepSize or \c 0.1 if stepSize is not defined. diff --git a/src/templates/qquickstackview.cpp b/src/templates/qquickstackview.cpp index 2e7def03..d428aec5 100644 --- a/src/templates/qquickstackview.cpp +++ b/src/templates/qquickstackview.cpp @@ -47,7 +47,7 @@ QT_BEGIN_NAMESPACE \qmltype StackView \inherits Control \instantiates QQuickStackView - \inqmlmodule QtQuick.Controls + \inqmlmodule Qt.labs.controls \ingroup navigation \brief Provides a stack-based navigation model. @@ -284,7 +284,7 @@ QQuickStackAttached *QQuickStackView::qmlAttachedProperties(QObject *object) } /*! - \qmlproperty bool QtQuick.Controls::StackView::busy + \qmlproperty bool Qt.labs.controls::StackView::busy \readonly This property holds whether a transition is running. */ @@ -295,7 +295,7 @@ bool QQuickStackView::busy() const } /*! - \qmlproperty int QtQuick.Controls::StackView::depth + \qmlproperty int Qt.labs.controls::StackView::depth \readonly This property holds the number of items currently pushed onto the stack. */ @@ -306,7 +306,7 @@ int QQuickStackView::depth() const } /*! - \qmlproperty Item QtQuick.Controls::StackView::currentItem + \qmlproperty Item Qt.labs.controls::StackView::currentItem \readonly This property holds the current top-most item in the stack. */ @@ -317,7 +317,7 @@ QQuickItem *QQuickStackView::currentItem() const } /*! - \qmlmethod Item QtQuick.Controls::StackView::get(index, behavior = DontLoad) + \qmlmethod Item Qt.labs.controls::StackView::get(index, behavior = DontLoad) Supported behavior values: \list @@ -340,7 +340,7 @@ QQuickItem *QQuickStackView::get(int index, LoadBehavior behavior) } /*! - \qmlmethod Item QtQuick.Controls::StackView::find(callback, behavior = DontLoad) + \qmlmethod Item Qt.labs.controls::StackView::find(callback, behavior = DontLoad) Supported behavior values: \list @@ -373,7 +373,7 @@ QQuickItem *QQuickStackView::find(const QJSValue &callback, LoadBehavior behavio } /*! - \qmlmethod Item QtQuick.Controls::StackView::push(item, properties, operation) + \qmlmethod Item Qt.labs.controls::StackView::push(item, properties, operation) TODO */ @@ -421,7 +421,7 @@ void QQuickStackView::push(QQmlV4Function *args) } /*! - \qmlmethod Item QtQuick.Controls::StackView::pop(item = null, operation = Transition) + \qmlmethod Item Qt.labs.controls::StackView::pop(item = null, operation = Transition) TODO */ @@ -483,7 +483,7 @@ void QQuickStackView::pop(QQmlV4Function *args) } /*! - \qmlmethod Item QtQuick.Controls::StackView::replace(item, properties, operation = Transition) + \qmlmethod Item Qt.labs.controls::StackView::replace(item, properties, operation = Transition) TODO */ @@ -540,7 +540,7 @@ void QQuickStackView::replace(QQmlV4Function *args) } /*! - \qmlmethod Item QtQuick.Controls::StackView::clear() + \qmlmethod Item Qt.labs.controls::StackView::clear() TODO */ @@ -554,7 +554,7 @@ void QQuickStackView::clear() } /*! - \qmlproperty var QtQuick.Controls::StackView::initialItem + \qmlproperty var Qt.labs.controls::StackView::initialItem This property holds the initial item. @@ -573,7 +573,7 @@ void QQuickStackView::setInitialItem(const QVariant &item) } /*! - \qmlproperty Transition QtQuick.Controls::StackView::popEnter + \qmlproperty Transition Qt.labs.controls::StackView::popEnter TODO */ @@ -596,7 +596,7 @@ void QQuickStackView::setPopEnter(QQuickTransition *enter) } /*! - \qmlproperty Transition QtQuick.Controls::StackView::popExit + \qmlproperty Transition Qt.labs.controls::StackView::popExit TODO */ @@ -619,7 +619,7 @@ void QQuickStackView::setPopExit(QQuickTransition *exit) } /*! - \qmlproperty Transition QtQuick.Controls::StackView::pushEnter + \qmlproperty Transition Qt.labs.controls::StackView::pushEnter TODO */ @@ -642,7 +642,7 @@ void QQuickStackView::setPushEnter(QQuickTransition *enter) } /*! - \qmlproperty Transition QtQuick.Controls::StackView::pushExit + \qmlproperty Transition Qt.labs.controls::StackView::pushExit TODO */ @@ -742,7 +742,7 @@ QQuickStackAttached::QQuickStackAttached(QQuickItem *parent) : } /*! - \qmlattachedproperty int QtQuick.Controls::StackView::index + \qmlattachedproperty int Qt.labs.controls::StackView::index TODO */ @@ -755,7 +755,7 @@ int QQuickStackAttached::index() const } /*! - \qmlattachedproperty StackView QtQuick.Controls::StackView::view + \qmlattachedproperty StackView Qt.labs.controls::StackView::view TODO */ @@ -768,7 +768,7 @@ QQuickStackView *QQuickStackAttached::view() const } /*! - \qmlattachedproperty enumeration QtQuick.Controls::StackView::status + \qmlattachedproperty enumeration Qt.labs.controls::StackView::status TODO */ diff --git a/src/templates/qquickswipeview.cpp b/src/templates/qquickswipeview.cpp index 29fdb849..bc48a170 100644 --- a/src/templates/qquickswipeview.cpp +++ b/src/templates/qquickswipeview.cpp @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE \qmltype SwipeView \inherits Container \instantiates QQuickSwipeView - \inqmlmodule QtQuick.Controls + \inqmlmodule Qt.labs.controls \ingroup navigation \brief A swipe view control. @@ -149,7 +149,7 @@ void QQuickSwipeView::contentItemChange(QQuickItem *newItem, QQuickItem *oldItem } /*! - \qmlattachedproperty int QtQuick.Controls::SwipeView::index + \qmlattachedproperty int Qt.labs.controls::SwipeView::index This attached property holds the index of each child item in the SwipeView. @@ -157,7 +157,7 @@ void QQuickSwipeView::contentItemChange(QQuickItem *newItem, QQuickItem *oldItem */ /*! - \qmlattachedproperty bool QtQuick.Controls::SwipeView::isCurrentItem + \qmlattachedproperty bool Qt.labs.controls::SwipeView::isCurrentItem This attached property is \c true if this child is the current item. @@ -165,7 +165,7 @@ void QQuickSwipeView::contentItemChange(QQuickItem *newItem, QQuickItem *oldItem */ /*! - \qmlattachedproperty SwipeView QtQuick.Controls::SwipeView::view + \qmlattachedproperty SwipeView Qt.labs.controls::SwipeView::view This attached property holds the view that manages this child item. diff --git a/src/templates/qquickswitch.cpp b/src/templates/qquickswitch.cpp index 0ce43dc7..2a89d5c7 100644 --- a/src/templates/qquickswitch.cpp +++ b/src/templates/qquickswitch.cpp @@ -45,23 +45,23 @@ QT_BEGIN_NAMESPACE \qmltype Switch \inherits Checkable \instantiates QQuickSwitch - \inqmlmodule QtQuick.Controls + \inqmlmodule Qt.labs.controls \ingroup buttons \brief A switch control. - \image qtquickcontrols2-switch.gif + \image qtlabscontrols-switch.gif Switch is an option button that can be dragged or toggled on (checked) or off (unchecked). Switches are typically used to select between two states. \table - \row \li \image qtquickcontrols2-switch-normal.png + \row \li \image qtlabscontrols-switch-normal.png \li A switch in its normal state. - \row \li \image qtquickcontrols2-switch-checked.png + \row \li \image qtlabscontrols-switch-checked.png \li A switch that is checked. - \row \li \image qtquickcontrols2-switch-focused.png + \row \li \image qtlabscontrols-switch-focused.png \li A switch that has active focus. - \row \li \image qtquickcontrols2-switch-disabled.png + \row \li \image qtlabscontrols-switch-disabled.png \li A switch that is disabled. \endtable @@ -107,7 +107,7 @@ QQuickSwitch::QQuickSwitch(QQuickItem *parent) : } /*! - \qmlproperty real QtQuick.Controls::Switch::position + \qmlproperty real Qt.labs.controls::Switch::position This property holds the logical position of the thumb indicator. @@ -136,7 +136,7 @@ void QQuickSwitch::setPosition(qreal position) } /*! - \qmlproperty real QtQuick.Controls::Switch::visualPosition + \qmlproperty real Qt.labs.controls::Switch::visualPosition This property holds the visual position of the thumb indicator. diff --git a/src/templates/qquicktabbar.cpp b/src/templates/qquicktabbar.cpp index c07aa919..91adf9f4 100644 --- a/src/templates/qquicktabbar.cpp +++ b/src/templates/qquicktabbar.cpp @@ -44,7 +44,7 @@ QT_BEGIN_NAMESPACE \qmltype TabBar \inherits Container \instantiates QQuickTabBar - \inqmlmodule QtQuick.Controls + \inqmlmodule Qt.labs.controls \ingroup tabs \brief A tab bar control. diff --git a/src/templates/qquicktabbutton.cpp b/src/templates/qquicktabbutton.cpp index 0dc02b83..b6254c04 100644 --- a/src/templates/qquicktabbutton.cpp +++ b/src/templates/qquicktabbutton.cpp @@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE \qmltype TabButton \inherits Checkable \instantiates QQuickTabButton - \inqmlmodule QtQuick.Controls + \inqmlmodule Qt.labs.controls \ingroup tabs \brief A tab button control. diff --git a/src/templates/qquicktextarea.cpp b/src/templates/qquicktextarea.cpp index 4063260e..5ea1d911 100644 --- a/src/templates/qquicktextarea.cpp +++ b/src/templates/qquicktextarea.cpp @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE \qmltype TextArea \inherits TextEdit \instantiates QQuickTextArea - \inqmlmodule QtQuick.Controls + \inqmlmodule Qt.labs.controls \ingroup editors \brief A multi line text input control. @@ -168,7 +168,7 @@ void QQuickTextArea::setFont(const QFont &font) } /*! - \qmlproperty Item QtQuick.Controls::TextArea::background + \qmlproperty Item Qt.labs.controls::TextArea::background This property holds the background item. @@ -202,7 +202,7 @@ void QQuickTextArea::setBackground(QQuickItem *background) } /*! - \qmlproperty Text QtQuick.Controls::TextArea::placeholder + \qmlproperty Text Qt.labs.controls::TextArea::placeholder This property holds the placeholder text item. diff --git a/src/templates/qquicktextfield.cpp b/src/templates/qquicktextfield.cpp index a16b3c14..07de1c5c 100644 --- a/src/templates/qquicktextfield.cpp +++ b/src/templates/qquicktextfield.cpp @@ -55,7 +55,7 @@ QT_BEGIN_NAMESPACE \qmltype TextField \inherits TextInput \instantiates QQuickTextField - \inqmlmodule QtQuick.Controls + \inqmlmodule Qt.labs.controls \ingroup editors \brief A single line text input control. @@ -63,11 +63,11 @@ QT_BEGIN_NAMESPACE with a \l placeholder text functionality, and adds decoration. \table - \row \li \image qtquickcontrols2-textfield-normal.png + \row \li \image qtlabscontrols-textfield-normal.png \li A text field in its normal state. - \row \li \image qtquickcontrols2-textfield-focused.png + \row \li \image qtlabscontrols-textfield-focused.png \li A text field that has active focus. - \row \li \image qtquickcontrols2-textfield-disabled.png + \row \li \image qtlabscontrols-textfield-disabled.png \li A text field that is disabled. \endtable @@ -81,7 +81,7 @@ QT_BEGIN_NAMESPACE */ /*! - \qmlsignal QtQuick.Controls::TextField::pressAndHold(MouseEvent mouse) + \qmlsignal Qt.labs.controls::TextField::pressAndHold(MouseEvent mouse) This signal is emitted when there is a long press (the delay depends on the platform plugin). The \l {MouseEvent}{mouse} parameter provides information about the press, including the x and y @@ -200,7 +200,7 @@ void QQuickTextField::setFont(const QFont &font) } /*! - \qmlproperty Item QtQuick.Controls::TextField::background + \qmlproperty Item Qt.labs.controls::TextField::background This property holds the background item. @@ -234,7 +234,7 @@ void QQuickTextField::setBackground(QQuickItem *background) } /*! - \qmlproperty Text QtQuick.Controls::TextField::placeholder + \qmlproperty Text Qt.labs.controls::TextField::placeholder This property holds the placeholder text item. diff --git a/src/templates/qquicktoolbar.cpp b/src/templates/qquicktoolbar.cpp index 7fdc98ae..256a6856 100644 --- a/src/templates/qquicktoolbar.cpp +++ b/src/templates/qquicktoolbar.cpp @@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE \qmltype ToolBar \inherits Frame \instantiates QQuickToolBar - \inqmlmodule QtQuick.Controls + \inqmlmodule Qt.labs.controls \ingroup containers \brief A tool bar control. diff --git a/src/templates/qquicktoolbutton.cpp b/src/templates/qquicktoolbutton.cpp index a26d9c7b..c1b7b9dd 100644 --- a/src/templates/qquicktoolbutton.cpp +++ b/src/templates/qquicktoolbutton.cpp @@ -42,7 +42,7 @@ QT_BEGIN_NAMESPACE \qmltype ToolButton \inherits Button \instantiates QQuickToolButton - \inqmlmodule QtQuick.Controls + \inqmlmodule Qt.labs.controls \ingroup buttons \brief A tool button control. diff --git a/src/templates/qquicktumbler.cpp b/src/templates/qquicktumbler.cpp index 38664cbd..cf1aac9b 100644 --- a/src/templates/qquicktumbler.cpp +++ b/src/templates/qquicktumbler.cpp @@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE \qmltype Tumbler \inherits Control \instantiates QQuickTumbler - \inqmlmodule QtQuick.Controls + \inqmlmodule Qt.labs.controls \ingroup containers \brief A spinnable wheel of items that can be selected. @@ -64,7 +64,7 @@ QT_BEGIN_NAMESPACE \snippet tst_tumbler.qml contentItem - \image qtquickcontrols2-tumbler-wrap.gif + \image qtlabscontrols-tumbler-wrap.gif */ class QQuickTumblerPrivate : public QQuickControlPrivate, public QQuickItemChangeListener @@ -194,7 +194,7 @@ QQuickTumbler::~QQuickTumbler() } /*! - \qmlproperty variant QtQuick.Controls::Tumbler::model + \qmlproperty variant Qt.labs.controls::Tumbler::model This property holds the model that provides data for this tumbler. */ @@ -214,7 +214,7 @@ void QQuickTumbler::setModel(const QVariant &model) } /*! - \qmlproperty int QtQuick.Controls::Tumbler::count + \qmlproperty int Qt.labs.controls::Tumbler::count This property holds the number of items in the model. */ @@ -225,7 +225,7 @@ int QQuickTumbler::count() const } /*! - \qmlproperty int QtQuick.Controls::Tumbler::currentIndex + \qmlproperty int Qt.labs.controls::Tumbler::currentIndex This property holds the index of the current item. */ @@ -242,7 +242,7 @@ void QQuickTumbler::setCurrentIndex(int currentIndex) } /*! - \qmlproperty Item QtQuick.Controls::Tumbler::currentItem + \qmlproperty Item Qt.labs.controls::Tumbler::currentItem This property holds the item at the current index. */ @@ -253,7 +253,7 @@ QQuickItem *QQuickTumbler::currentItem() const } /*! - \qmlproperty component QtQuick.Controls::Tumbler::delegate + \qmlproperty component Qt.labs.controls::Tumbler::delegate This property holds the delegate used to display each item. */ @@ -273,7 +273,7 @@ void QQuickTumbler::setDelegate(QQmlComponent *delegate) } /*! - \qmlproperty int QtQuick.Controls::Tumbler::visibleItemCount + \qmlproperty int Qt.labs.controls::Tumbler::visibleItemCount This property holds the number of items visible in the tumbler. It must be an odd number, as the current item is always vertically centered. diff --git a/tests/auto/accessibility/data/busyindicator.qml b/tests/auto/accessibility/data/busyindicator.qml index 4bde9634..4ac1b9ca 100644 --- a/tests/auto/accessibility/data/busyindicator.qml +++ b/tests/auto/accessibility/data/busyindicator.qml @@ -1,6 +1,6 @@ import QtQuick 2.5 import QtQuick.Window 2.2 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Window { visible: true diff --git a/tests/auto/accessibility/data/button.qml b/tests/auto/accessibility/data/button.qml index 75925185..d6acfdb0 100644 --- a/tests/auto/accessibility/data/button.qml +++ b/tests/auto/accessibility/data/button.qml @@ -1,6 +1,6 @@ import QtQuick 2.5 import QtQuick.Window 2.2 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Window { visible: true diff --git a/tests/auto/accessibility/data/checkbox.qml b/tests/auto/accessibility/data/checkbox.qml index 9700663d..4752dcae 100644 --- a/tests/auto/accessibility/data/checkbox.qml +++ b/tests/auto/accessibility/data/checkbox.qml @@ -1,6 +1,6 @@ import QtQuick 2.5 import QtQuick.Window 2.2 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Window { visible: true diff --git a/tests/auto/accessibility/data/control.qml b/tests/auto/accessibility/data/control.qml index ceaba509..42fe7435 100644 --- a/tests/auto/accessibility/data/control.qml +++ b/tests/auto/accessibility/data/control.qml @@ -1,6 +1,6 @@ import QtQuick 2.5 import QtQuick.Window 2.2 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Window { visible: true diff --git a/tests/auto/accessibility/data/dial.qml b/tests/auto/accessibility/data/dial.qml index 6b2333b1..af107c08 100644 --- a/tests/auto/accessibility/data/dial.qml +++ b/tests/auto/accessibility/data/dial.qml @@ -1,6 +1,6 @@ import QtQuick 2.5 import QtQuick.Window 2.2 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Window { visible: true diff --git a/tests/auto/accessibility/data/label.qml b/tests/auto/accessibility/data/label.qml index 409898d4..19a08984 100644 --- a/tests/auto/accessibility/data/label.qml +++ b/tests/auto/accessibility/data/label.qml @@ -1,6 +1,6 @@ import QtQuick 2.5 import QtQuick.Window 2.2 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Window { visible: true diff --git a/tests/auto/accessibility/data/pageindicator.qml b/tests/auto/accessibility/data/pageindicator.qml index b42d3f9e..8fce79f3 100644 --- a/tests/auto/accessibility/data/pageindicator.qml +++ b/tests/auto/accessibility/data/pageindicator.qml @@ -1,6 +1,6 @@ import QtQuick 2.5 import QtQuick.Window 2.2 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Window { visible: true diff --git a/tests/auto/accessibility/data/progressbar.qml b/tests/auto/accessibility/data/progressbar.qml index 283db003..3a6ccfc2 100644 --- a/tests/auto/accessibility/data/progressbar.qml +++ b/tests/auto/accessibility/data/progressbar.qml @@ -1,6 +1,6 @@ import QtQuick 2.5 import QtQuick.Window 2.2 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Window { visible: true diff --git a/tests/auto/accessibility/data/radiobutton.qml b/tests/auto/accessibility/data/radiobutton.qml index 1883fff8..54f240fa 100644 --- a/tests/auto/accessibility/data/radiobutton.qml +++ b/tests/auto/accessibility/data/radiobutton.qml @@ -1,6 +1,6 @@ import QtQuick 2.5 import QtQuick.Window 2.2 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Window { visible: true diff --git a/tests/auto/accessibility/data/scrollbar.qml b/tests/auto/accessibility/data/scrollbar.qml index 2e360422..ab6ee421 100644 --- a/tests/auto/accessibility/data/scrollbar.qml +++ b/tests/auto/accessibility/data/scrollbar.qml @@ -1,6 +1,6 @@ import QtQuick 2.5 import QtQuick.Window 2.2 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Window { visible: true diff --git a/tests/auto/accessibility/data/scrollindicator.qml b/tests/auto/accessibility/data/scrollindicator.qml index e933dece..ba2ee3f9 100644 --- a/tests/auto/accessibility/data/scrollindicator.qml +++ b/tests/auto/accessibility/data/scrollindicator.qml @@ -1,6 +1,6 @@ import QtQuick 2.5 import QtQuick.Window 2.2 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Window { visible: true diff --git a/tests/auto/accessibility/data/slider.qml b/tests/auto/accessibility/data/slider.qml index 060bb66c..3b906336 100644 --- a/tests/auto/accessibility/data/slider.qml +++ b/tests/auto/accessibility/data/slider.qml @@ -1,6 +1,6 @@ import QtQuick 2.5 import QtQuick.Window 2.2 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Window { visible: true diff --git a/tests/auto/accessibility/data/switch.qml b/tests/auto/accessibility/data/switch.qml index 9913e3f1..88d9af72 100644 --- a/tests/auto/accessibility/data/switch.qml +++ b/tests/auto/accessibility/data/switch.qml @@ -1,6 +1,6 @@ import QtQuick 2.5 import QtQuick.Window 2.2 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Window { visible: true diff --git a/tests/auto/accessibility/data/tabbar.qml b/tests/auto/accessibility/data/tabbar.qml index 127c4e81..0951a84c 100644 --- a/tests/auto/accessibility/data/tabbar.qml +++ b/tests/auto/accessibility/data/tabbar.qml @@ -1,6 +1,6 @@ import QtQuick 2.5 import QtQuick.Window 2.2 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Window { visible: true diff --git a/tests/auto/accessibility/data/tabbutton.qml b/tests/auto/accessibility/data/tabbutton.qml index cfb04ca2..cdae7a49 100644 --- a/tests/auto/accessibility/data/tabbutton.qml +++ b/tests/auto/accessibility/data/tabbutton.qml @@ -1,6 +1,6 @@ import QtQuick 2.5 import QtQuick.Window 2.2 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Window { visible: true diff --git a/tests/auto/accessibility/data/textarea-2.qml b/tests/auto/accessibility/data/textarea-2.qml index 381c08bd..31330fa8 100644 --- a/tests/auto/accessibility/data/textarea-2.qml +++ b/tests/auto/accessibility/data/textarea-2.qml @@ -1,6 +1,6 @@ import QtQuick 2.5 import QtQuick.Window 2.2 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Window { visible: true diff --git a/tests/auto/accessibility/data/textarea.qml b/tests/auto/accessibility/data/textarea.qml index 9ae51ca8..2108a5bf 100644 --- a/tests/auto/accessibility/data/textarea.qml +++ b/tests/auto/accessibility/data/textarea.qml @@ -1,6 +1,6 @@ import QtQuick 2.5 import QtQuick.Window 2.2 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Window { visible: true diff --git a/tests/auto/accessibility/data/textfield-2.qml b/tests/auto/accessibility/data/textfield-2.qml index 5db46d82..29c7b62b 100644 --- a/tests/auto/accessibility/data/textfield-2.qml +++ b/tests/auto/accessibility/data/textfield-2.qml @@ -1,6 +1,6 @@ import QtQuick 2.5 import QtQuick.Window 2.2 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Window { visible: true diff --git a/tests/auto/accessibility/data/textfield.qml b/tests/auto/accessibility/data/textfield.qml index c3ea9b08..d25b325b 100644 --- a/tests/auto/accessibility/data/textfield.qml +++ b/tests/auto/accessibility/data/textfield.qml @@ -1,6 +1,6 @@ import QtQuick 2.5 import QtQuick.Window 2.2 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Window { visible: true diff --git a/tests/auto/accessibility/data/toolbar.qml b/tests/auto/accessibility/data/toolbar.qml index c0503aef..bb19b839 100644 --- a/tests/auto/accessibility/data/toolbar.qml +++ b/tests/auto/accessibility/data/toolbar.qml @@ -1,6 +1,6 @@ import QtQuick 2.5 import QtQuick.Window 2.2 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Window { visible: true diff --git a/tests/auto/accessibility/data/toolbutton.qml b/tests/auto/accessibility/data/toolbutton.qml index 63aacddc..a4bbf7a3 100644 --- a/tests/auto/accessibility/data/toolbutton.qml +++ b/tests/auto/accessibility/data/toolbutton.qml @@ -1,6 +1,6 @@ import QtQuick 2.5 import QtQuick.Window 2.2 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Window { visible: true diff --git a/tests/auto/activeFocusOnTab/data/activeFocusOnTab.qml b/tests/auto/activeFocusOnTab/data/activeFocusOnTab.qml index dd2281dd..05cb464b 100644 --- a/tests/auto/activeFocusOnTab/data/activeFocusOnTab.qml +++ b/tests/auto/activeFocusOnTab/data/activeFocusOnTab.qml @@ -40,7 +40,7 @@ import QtQuick 2.5 import QtQuick.Layouts 1.2 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Item { id: main diff --git a/tests/auto/applicationwindow/data/activefocusontab.qml b/tests/auto/applicationwindow/data/activefocusontab.qml index 6cbd132f..1ff677fc 100644 --- a/tests/auto/applicationwindow/data/activefocusontab.qml +++ b/tests/auto/applicationwindow/data/activefocusontab.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 ApplicationWindow { title: "Test Application Window" diff --git a/tests/auto/applicationwindow/data/basicapplicationwindow.qml b/tests/auto/applicationwindow/data/basicapplicationwindow.qml index afac65f3..72266cf6 100644 --- a/tests/auto/applicationwindow/data/basicapplicationwindow.qml +++ b/tests/auto/applicationwindow/data/basicapplicationwindow.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 ApplicationWindow { title: "Test Application Window" diff --git a/tests/auto/applicationwindow/data/defaultFocus.qml b/tests/auto/applicationwindow/data/defaultFocus.qml index ed2a9303..ff4e4e4c 100644 --- a/tests/auto/applicationwindow/data/defaultFocus.qml +++ b/tests/auto/applicationwindow/data/defaultFocus.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 ApplicationWindow { visible: true diff --git a/tests/auto/applicationwindow/data/fill.qml b/tests/auto/applicationwindow/data/fill.qml index 8e468f49..6d4c92c9 100644 --- a/tests/auto/applicationwindow/data/fill.qml +++ b/tests/auto/applicationwindow/data/fill.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 ApplicationWindow { width: 400 diff --git a/tests/auto/controls/data/TumblerDatePicker.qml b/tests/auto/controls/data/TumblerDatePicker.qml index 18d7fb97..a929a53f 100644 --- a/tests/auto/controls/data/TumblerDatePicker.qml +++ b/tests/auto/controls/data/TumblerDatePicker.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 Row { id: datePicker diff --git a/tests/auto/controls/data/tst_busyindicator.qml b/tests/auto/controls/data/tst_busyindicator.qml index 142ec70a..d4cb9d31 100644 --- a/tests/auto/controls/data/tst_busyindicator.qml +++ b/tests/auto/controls/data/tst_busyindicator.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_button.qml b/tests/auto/controls/data/tst_button.qml index eab82eab..67c68b1d 100644 --- a/tests/auto/controls/data/tst_button.qml +++ b/tests/auto/controls/data/tst_button.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_checkbox.qml b/tests/auto/controls/data/tst_checkbox.qml index b4874642..caf6658b 100644 --- a/tests/auto/controls/data/tst_checkbox.qml +++ b/tests/auto/controls/data/tst_checkbox.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_control.qml b/tests/auto/controls/data/tst_control.qml index 8a9caa4d..2278f1ef 100644 --- a/tests/auto/controls/data/tst_control.qml +++ b/tests/auto/controls/data/tst_control.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 import Qt.labs.templates 1.0 as T TestCase { diff --git a/tests/auto/controls/data/tst_dial.qml b/tests/auto/controls/data/tst_dial.qml index 5a4a66a5..7468c530 100644 --- a/tests/auto/controls/data/tst_dial.qml +++ b/tests/auto/controls/data/tst_dial.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_drawer.qml b/tests/auto/controls/data/tst_drawer.qml index af815bed..28db11c8 100644 --- a/tests/auto/controls/data/tst_drawer.qml +++ b/tests/auto/controls/data/tst_drawer.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_exclusivegroup.qml b/tests/auto/controls/data/tst_exclusivegroup.qml index 61076ec8..b4ff560c 100644 --- a/tests/auto/controls/data/tst_exclusivegroup.qml +++ b/tests/auto/controls/data/tst_exclusivegroup.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_frame.qml b/tests/auto/controls/data/tst_frame.qml index 6b65691b..feb6cf11 100644 --- a/tests/auto/controls/data/tst_frame.qml +++ b/tests/auto/controls/data/tst_frame.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_groupbox.qml b/tests/auto/controls/data/tst_groupbox.qml index baa1d3f9..55568923 100644 --- a/tests/auto/controls/data/tst_groupbox.qml +++ b/tests/auto/controls/data/tst_groupbox.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_label.qml b/tests/auto/controls/data/tst_label.qml index f9df8592..2af02cdf 100644 --- a/tests/auto/controls/data/tst_label.qml +++ b/tests/auto/controls/data/tst_label.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_pageindicator.qml b/tests/auto/controls/data/tst_pageindicator.qml index 9ac98e46..3a37aa25 100644 --- a/tests/auto/controls/data/tst_pageindicator.qml +++ b/tests/auto/controls/data/tst_pageindicator.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_progressbar.qml b/tests/auto/controls/data/tst_progressbar.qml index b9135fd1..ed09f5e9 100644 --- a/tests/auto/controls/data/tst_progressbar.qml +++ b/tests/auto/controls/data/tst_progressbar.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_radiobutton.qml b/tests/auto/controls/data/tst_radiobutton.qml index 050cadb7..d76a8c38 100644 --- a/tests/auto/controls/data/tst_radiobutton.qml +++ b/tests/auto/controls/data/tst_radiobutton.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_scrollbar.qml b/tests/auto/controls/data/tst_scrollbar.qml index 50a203c3..842cd9ff 100644 --- a/tests/auto/controls/data/tst_scrollbar.qml +++ b/tests/auto/controls/data/tst_scrollbar.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 import Qt.labs.templates 1.0 as T TestCase { diff --git a/tests/auto/controls/data/tst_scrollindicator.qml b/tests/auto/controls/data/tst_scrollindicator.qml index 2eba2afc..ac320117 100644 --- a/tests/auto/controls/data/tst_scrollindicator.qml +++ b/tests/auto/controls/data/tst_scrollindicator.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 import Qt.labs.templates 1.0 as T TestCase { diff --git a/tests/auto/controls/data/tst_slider.qml b/tests/auto/controls/data/tst_slider.qml index 3e15fbf6..04d328c8 100644 --- a/tests/auto/controls/data/tst_slider.qml +++ b/tests/auto/controls/data/tst_slider.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_stackview.qml b/tests/auto/controls/data/tst_stackview.qml index dc56830a..7ef13535 100644 --- a/tests/auto/controls/data/tst_stackview.qml +++ b/tests/auto/controls/data/tst_stackview.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 import Qt.labs.templates 1.0 as T TestCase { diff --git a/tests/auto/controls/data/tst_swipeview.qml b/tests/auto/controls/data/tst_swipeview.qml index ceb316d4..71731ae9 100644 --- a/tests/auto/controls/data/tst_swipeview.qml +++ b/tests/auto/controls/data/tst_swipeview.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 import Qt.labs.templates 1.0 as T TestCase { diff --git a/tests/auto/controls/data/tst_switch.qml b/tests/auto/controls/data/tst_switch.qml index 94aaab13..153a28b9 100644 --- a/tests/auto/controls/data/tst_switch.qml +++ b/tests/auto/controls/data/tst_switch.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_tabbar.qml b/tests/auto/controls/data/tst_tabbar.qml index db5f45fa..2b272ae7 100644 --- a/tests/auto/controls/data/tst_tabbar.qml +++ b/tests/auto/controls/data/tst_tabbar.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_textarea.qml b/tests/auto/controls/data/tst_textarea.qml index 0ec58825..ba80a721 100644 --- a/tests/auto/controls/data/tst_textarea.qml +++ b/tests/auto/controls/data/tst_textarea.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_textfield.qml b/tests/auto/controls/data/tst_textfield.qml index 18abb740..bede2296 100644 --- a/tests/auto/controls/data/tst_textfield.qml +++ b/tests/auto/controls/data/tst_textfield.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_theme.qml b/tests/auto/controls/data/tst_theme.qml index 3638950c..4f94f2f5 100644 --- a/tests/auto/controls/data/tst_theme.qml +++ b/tests/auto/controls/data/tst_theme.qml @@ -41,7 +41,7 @@ import QtQuick 2.2 import QtQuick.Window 2.2 import QtTest 1.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_toolbar.qml b/tests/auto/controls/data/tst_toolbar.qml index 8b20cca8..ac116a86 100644 --- a/tests/auto/controls/data/tst_toolbar.qml +++ b/tests/auto/controls/data/tst_toolbar.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_toolbutton.qml b/tests/auto/controls/data/tst_toolbutton.qml index c78a922a..5dfac358 100644 --- a/tests/auto/controls/data/tst_toolbutton.qml +++ b/tests/auto/controls/data/tst_toolbutton.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 TestCase { id: testCase diff --git a/tests/auto/controls/data/tst_tumbler.qml b/tests/auto/controls/data/tst_tumbler.qml index 3a8937bb..cd778b74 100644 --- a/tests/auto/controls/data/tst_tumbler.qml +++ b/tests/auto/controls/data/tst_tumbler.qml @@ -40,7 +40,7 @@ import QtQuick 2.2 import QtTest 1.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 import Qt.labs.templates 1.0 as T TestCase { @@ -58,7 +58,7 @@ TestCase { readonly property real defaultListViewTumblerOffset: -defaultImplicitDelegateHeight function init() { - tumbler = Qt.createQmlObject("import QtQuick.Controls 2.0; Tumbler { }", testCase, ""); + tumbler = Qt.createQmlObject("import Qt.labs.controls 1.0; Tumbler { }", testCase, ""); verify(tumbler, "Tumbler: failed to create an instance"); compare(tumbler.contentItem.parent, tumbler); } diff --git a/tests/auto/sanity/tst_sanity.cpp b/tests/auto/sanity/tst_sanity.cpp index 6568f0dc..bf6a3d11 100644 --- a/tests/auto/sanity/tst_sanity.cpp +++ b/tests/auto/sanity/tst_sanity.cpp @@ -148,7 +148,7 @@ void tst_Sanity::initTestCase() QQmlEngine engine; foreach (const QString &path, engine.importPathList()) { files.unite(listQmlFiles(QDir(path + "/Qt/labs/calendar"))); - files.unite(listQmlFiles(QDir(path + "/QtQuick/Controls.2"))); + files.unite(listQmlFiles(QDir(path + "/Qt/labs/controls"))); } } diff --git a/tests/auto/snippets/data/busyindicator/qtlabscontrols-busyindicator-background.qml b/tests/auto/snippets/data/busyindicator/qtlabscontrols-busyindicator-background.qml new file mode 100644 index 00000000..54d68234 --- /dev/null +++ b/tests/auto/snippets/data/busyindicator/qtlabscontrols-busyindicator-background.qml @@ -0,0 +1,9 @@ +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +BusyIndicator { + background: Rectangle { + color: 'transparent' + border.color: 'red' + } +} diff --git a/tests/auto/snippets/data/busyindicator/qtlabscontrols-busyindicator-indicator.qml b/tests/auto/snippets/data/busyindicator/qtlabscontrols-busyindicator-indicator.qml new file mode 100644 index 00000000..dffd61b6 --- /dev/null +++ b/tests/auto/snippets/data/busyindicator/qtlabscontrols-busyindicator-indicator.qml @@ -0,0 +1,10 @@ +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +BusyIndicator { + Rectangle { + anchors.fill: indicator + color: 'transparent' + border.color: 'red' + } +} diff --git a/tests/auto/snippets/data/busyindicator/qtquickcontrols2-busyindicator-background.qml b/tests/auto/snippets/data/busyindicator/qtquickcontrols2-busyindicator-background.qml deleted file mode 100644 index 88b413cb..00000000 --- a/tests/auto/snippets/data/busyindicator/qtquickcontrols2-busyindicator-background.qml +++ /dev/null @@ -1,9 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -BusyIndicator { - background: Rectangle { - color: 'transparent' - border.color: 'red' - } -} diff --git a/tests/auto/snippets/data/busyindicator/qtquickcontrols2-busyindicator-indicator.qml b/tests/auto/snippets/data/busyindicator/qtquickcontrols2-busyindicator-indicator.qml deleted file mode 100644 index 317a6a3f..00000000 --- a/tests/auto/snippets/data/busyindicator/qtquickcontrols2-busyindicator-indicator.qml +++ /dev/null @@ -1,10 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -BusyIndicator { - Rectangle { - anchors.fill: indicator - color: 'transparent' - border.color: 'red' - } -} diff --git a/tests/auto/snippets/data/button/qtlabscontrols-button-background.qml b/tests/auto/snippets/data/button/qtlabscontrols-button-background.qml new file mode 100644 index 00000000..287fe380 --- /dev/null +++ b/tests/auto/snippets/data/button/qtlabscontrols-button-background.qml @@ -0,0 +1,12 @@ +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +Button { + width: 80 + text: "Button" + Rectangle { + anchors.fill: background + color: 'transparent' + border.color: 'red' + } +} diff --git a/tests/auto/snippets/data/button/qtlabscontrols-button-disabled.qml b/tests/auto/snippets/data/button/qtlabscontrols-button-disabled.qml new file mode 100644 index 00000000..e2bd4fda --- /dev/null +++ b/tests/auto/snippets/data/button/qtlabscontrols-button-disabled.qml @@ -0,0 +1,8 @@ +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +Button { + width: 80 + text: "Disabled" + enabled: false +} diff --git a/tests/auto/snippets/data/button/qtlabscontrols-button-focused.qml b/tests/auto/snippets/data/button/qtlabscontrols-button-focused.qml new file mode 100644 index 00000000..7b006204 --- /dev/null +++ b/tests/auto/snippets/data/button/qtlabscontrols-button-focused.qml @@ -0,0 +1,8 @@ +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +Button { + width: 80 + text: "Focused" + focus: true +} diff --git a/tests/auto/snippets/data/button/qtlabscontrols-button-label.qml b/tests/auto/snippets/data/button/qtlabscontrols-button-label.qml new file mode 100644 index 00000000..a068bcb2 --- /dev/null +++ b/tests/auto/snippets/data/button/qtlabscontrols-button-label.qml @@ -0,0 +1,12 @@ +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +Button { + width: 80 + text: "Button" + Rectangle { + anchors.fill: label + color: 'transparent' + border.color: 'red' + } +} diff --git a/tests/auto/snippets/data/button/qtlabscontrols-button-normal.qml b/tests/auto/snippets/data/button/qtlabscontrols-button-normal.qml new file mode 100644 index 00000000..fbb946f9 --- /dev/null +++ b/tests/auto/snippets/data/button/qtlabscontrols-button-normal.qml @@ -0,0 +1,7 @@ +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +Button { + width: 80 + text: "Normal" +} diff --git a/tests/auto/snippets/data/button/qtlabscontrols-button-pressed.qml b/tests/auto/snippets/data/button/qtlabscontrols-button-pressed.qml new file mode 100644 index 00000000..272f2e2c --- /dev/null +++ b/tests/auto/snippets/data/button/qtlabscontrols-button-pressed.qml @@ -0,0 +1,8 @@ +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +Button { + width: 80 + text: "Pressed" + pressed: true +} diff --git a/tests/auto/snippets/data/button/qtquickcontrols2-button-background.qml b/tests/auto/snippets/data/button/qtquickcontrols2-button-background.qml deleted file mode 100644 index 44f163d2..00000000 --- a/tests/auto/snippets/data/button/qtquickcontrols2-button-background.qml +++ /dev/null @@ -1,12 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -Button { - width: 80 - text: "Button" - Rectangle { - anchors.fill: background - color: 'transparent' - border.color: 'red' - } -} diff --git a/tests/auto/snippets/data/button/qtquickcontrols2-button-disabled.qml b/tests/auto/snippets/data/button/qtquickcontrols2-button-disabled.qml deleted file mode 100644 index 401966b9..00000000 --- a/tests/auto/snippets/data/button/qtquickcontrols2-button-disabled.qml +++ /dev/null @@ -1,8 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -Button { - width: 80 - text: "Disabled" - enabled: false -} diff --git a/tests/auto/snippets/data/button/qtquickcontrols2-button-focused.qml b/tests/auto/snippets/data/button/qtquickcontrols2-button-focused.qml deleted file mode 100644 index d12d837f..00000000 --- a/tests/auto/snippets/data/button/qtquickcontrols2-button-focused.qml +++ /dev/null @@ -1,8 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -Button { - width: 80 - text: "Focused" - focus: true -} diff --git a/tests/auto/snippets/data/button/qtquickcontrols2-button-label.qml b/tests/auto/snippets/data/button/qtquickcontrols2-button-label.qml deleted file mode 100644 index d7f76f0f..00000000 --- a/tests/auto/snippets/data/button/qtquickcontrols2-button-label.qml +++ /dev/null @@ -1,12 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -Button { - width: 80 - text: "Button" - Rectangle { - anchors.fill: label - color: 'transparent' - border.color: 'red' - } -} diff --git a/tests/auto/snippets/data/button/qtquickcontrols2-button-normal.qml b/tests/auto/snippets/data/button/qtquickcontrols2-button-normal.qml deleted file mode 100644 index efd225de..00000000 --- a/tests/auto/snippets/data/button/qtquickcontrols2-button-normal.qml +++ /dev/null @@ -1,7 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -Button { - width: 80 - text: "Normal" -} diff --git a/tests/auto/snippets/data/button/qtquickcontrols2-button-pressed.qml b/tests/auto/snippets/data/button/qtquickcontrols2-button-pressed.qml deleted file mode 100644 index 3ebcc39e..00000000 --- a/tests/auto/snippets/data/button/qtquickcontrols2-button-pressed.qml +++ /dev/null @@ -1,8 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -Button { - width: 80 - text: "Pressed" - pressed: true -} diff --git a/tests/auto/snippets/data/calendarmodel/qtlabscalendar-calendarmodel.qml b/tests/auto/snippets/data/calendarmodel/qtlabscalendar-calendarmodel.qml index d096019f..ca13e815 100644 --- a/tests/auto/snippets/data/calendarmodel/qtlabscalendar-calendarmodel.qml +++ b/tests/auto/snippets/data/calendarmodel/qtlabscalendar-calendarmodel.qml @@ -1,6 +1,6 @@ import QtQuick 2.0 import Qt.labs.calendar 1.0 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 import Qt.labs.templates 1.0 as T //! [1] diff --git a/tests/auto/snippets/data/checkbox/qtlabscontrols-checkbox-background.qml b/tests/auto/snippets/data/checkbox/qtlabscontrols-checkbox-background.qml new file mode 100644 index 00000000..cea3fe70 --- /dev/null +++ b/tests/auto/snippets/data/checkbox/qtlabscontrols-checkbox-background.qml @@ -0,0 +1,10 @@ +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +CheckBox { + text: "CheckBox" + background: Rectangle { + color: "transparent" + border.color: "red" + } +} diff --git a/tests/auto/snippets/data/checkbox/qtlabscontrols-checkbox-checked.qml b/tests/auto/snippets/data/checkbox/qtlabscontrols-checkbox-checked.qml new file mode 100644 index 00000000..b0620f04 --- /dev/null +++ b/tests/auto/snippets/data/checkbox/qtlabscontrols-checkbox-checked.qml @@ -0,0 +1,7 @@ +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +CheckBox { + text: "Checked" + checked: true +} diff --git a/tests/auto/snippets/data/checkbox/qtlabscontrols-checkbox-disabled.qml b/tests/auto/snippets/data/checkbox/qtlabscontrols-checkbox-disabled.qml new file mode 100644 index 00000000..6aa33095 --- /dev/null +++ b/tests/auto/snippets/data/checkbox/qtlabscontrols-checkbox-disabled.qml @@ -0,0 +1,7 @@ +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +CheckBox { + text: "Disabled" + enabled: false +} diff --git a/tests/auto/snippets/data/checkbox/qtlabscontrols-checkbox-focused.qml b/tests/auto/snippets/data/checkbox/qtlabscontrols-checkbox-focused.qml new file mode 100644 index 00000000..efacc11d --- /dev/null +++ b/tests/auto/snippets/data/checkbox/qtlabscontrols-checkbox-focused.qml @@ -0,0 +1,7 @@ +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +CheckBox { + text: "Focused" + focus: true +} diff --git a/tests/auto/snippets/data/checkbox/qtlabscontrols-checkbox-indicator.qml b/tests/auto/snippets/data/checkbox/qtlabscontrols-checkbox-indicator.qml new file mode 100644 index 00000000..f5dc9e9c --- /dev/null +++ b/tests/auto/snippets/data/checkbox/qtlabscontrols-checkbox-indicator.qml @@ -0,0 +1,11 @@ +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +CheckBox { + text: "CheckBox" + Rectangle { + anchors.fill: indicator + color: "transparent" + border.color: "red" + } +} diff --git a/tests/auto/snippets/data/checkbox/qtlabscontrols-checkbox-label.qml b/tests/auto/snippets/data/checkbox/qtlabscontrols-checkbox-label.qml new file mode 100644 index 00000000..9ccb7756 --- /dev/null +++ b/tests/auto/snippets/data/checkbox/qtlabscontrols-checkbox-label.qml @@ -0,0 +1,11 @@ +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +CheckBox { + text: "CheckBox" + Rectangle { + anchors.fill: label + color: "transparent" + border.color: "red" + } +} diff --git a/tests/auto/snippets/data/checkbox/qtlabscontrols-checkbox-normal.qml b/tests/auto/snippets/data/checkbox/qtlabscontrols-checkbox-normal.qml new file mode 100644 index 00000000..6d1c23dc --- /dev/null +++ b/tests/auto/snippets/data/checkbox/qtlabscontrols-checkbox-normal.qml @@ -0,0 +1,6 @@ +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +CheckBox { + text: "Normal" +} diff --git a/tests/auto/snippets/data/checkbox/qtquickcontrols2-checkbox-background.qml b/tests/auto/snippets/data/checkbox/qtquickcontrols2-checkbox-background.qml deleted file mode 100644 index 95c0d1dc..00000000 --- a/tests/auto/snippets/data/checkbox/qtquickcontrols2-checkbox-background.qml +++ /dev/null @@ -1,10 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -CheckBox { - text: "CheckBox" - background: Rectangle { - color: "transparent" - border.color: "red" - } -} diff --git a/tests/auto/snippets/data/checkbox/qtquickcontrols2-checkbox-checked.qml b/tests/auto/snippets/data/checkbox/qtquickcontrols2-checkbox-checked.qml deleted file mode 100644 index 0e0de49a..00000000 --- a/tests/auto/snippets/data/checkbox/qtquickcontrols2-checkbox-checked.qml +++ /dev/null @@ -1,7 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -CheckBox { - text: "Checked" - checked: true -} diff --git a/tests/auto/snippets/data/checkbox/qtquickcontrols2-checkbox-disabled.qml b/tests/auto/snippets/data/checkbox/qtquickcontrols2-checkbox-disabled.qml deleted file mode 100644 index 92b64adc..00000000 --- a/tests/auto/snippets/data/checkbox/qtquickcontrols2-checkbox-disabled.qml +++ /dev/null @@ -1,7 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -CheckBox { - text: "Disabled" - enabled: false -} diff --git a/tests/auto/snippets/data/checkbox/qtquickcontrols2-checkbox-focused.qml b/tests/auto/snippets/data/checkbox/qtquickcontrols2-checkbox-focused.qml deleted file mode 100644 index 35770d55..00000000 --- a/tests/auto/snippets/data/checkbox/qtquickcontrols2-checkbox-focused.qml +++ /dev/null @@ -1,7 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -CheckBox { - text: "Focused" - focus: true -} diff --git a/tests/auto/snippets/data/checkbox/qtquickcontrols2-checkbox-indicator.qml b/tests/auto/snippets/data/checkbox/qtquickcontrols2-checkbox-indicator.qml deleted file mode 100644 index 8fda4b1f..00000000 --- a/tests/auto/snippets/data/checkbox/qtquickcontrols2-checkbox-indicator.qml +++ /dev/null @@ -1,11 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -CheckBox { - text: "CheckBox" - Rectangle { - anchors.fill: indicator - color: "transparent" - border.color: "red" - } -} diff --git a/tests/auto/snippets/data/checkbox/qtquickcontrols2-checkbox-label.qml b/tests/auto/snippets/data/checkbox/qtquickcontrols2-checkbox-label.qml deleted file mode 100644 index 6deb3944..00000000 --- a/tests/auto/snippets/data/checkbox/qtquickcontrols2-checkbox-label.qml +++ /dev/null @@ -1,11 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -CheckBox { - text: "CheckBox" - Rectangle { - anchors.fill: label - color: "transparent" - border.color: "red" - } -} diff --git a/tests/auto/snippets/data/checkbox/qtquickcontrols2-checkbox-normal.qml b/tests/auto/snippets/data/checkbox/qtquickcontrols2-checkbox-normal.qml deleted file mode 100644 index d453eabc..00000000 --- a/tests/auto/snippets/data/checkbox/qtquickcontrols2-checkbox-normal.qml +++ /dev/null @@ -1,6 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -CheckBox { - text: "Normal" -} diff --git a/tests/auto/snippets/data/dial/qtlabscontrols-dial-background.qml b/tests/auto/snippets/data/dial/qtlabscontrols-dial-background.qml new file mode 100644 index 00000000..1f13eef6 --- /dev/null +++ b/tests/auto/snippets/data/dial/qtlabscontrols-dial-background.qml @@ -0,0 +1,10 @@ +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +Dial { + Rectangle { + anchors.fill: background + color: 'transparent' + border.color: 'red' + } +} diff --git a/tests/auto/snippets/data/dial/qtlabscontrols-dial-handle.qml b/tests/auto/snippets/data/dial/qtlabscontrols-dial-handle.qml new file mode 100644 index 00000000..afb30639 --- /dev/null +++ b/tests/auto/snippets/data/dial/qtlabscontrols-dial-handle.qml @@ -0,0 +1,14 @@ +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +Dial { + id: dial + + Rectangle { + parent: dial.handle + anchors.fill: parent + color: 'transparent' + border.color: 'red' + antialiasing: true + } +} diff --git a/tests/auto/snippets/data/dial/qtquickcontrols2-dial-background.qml b/tests/auto/snippets/data/dial/qtquickcontrols2-dial-background.qml deleted file mode 100644 index b9a48498..00000000 --- a/tests/auto/snippets/data/dial/qtquickcontrols2-dial-background.qml +++ /dev/null @@ -1,10 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -Dial { - Rectangle { - anchors.fill: background - color: 'transparent' - border.color: 'red' - } -} diff --git a/tests/auto/snippets/data/dial/qtquickcontrols2-dial-handle.qml b/tests/auto/snippets/data/dial/qtquickcontrols2-dial-handle.qml deleted file mode 100644 index 9851478e..00000000 --- a/tests/auto/snippets/data/dial/qtquickcontrols2-dial-handle.qml +++ /dev/null @@ -1,14 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -Dial { - id: dial - - Rectangle { - parent: dial.handle - anchors.fill: parent - color: 'transparent' - border.color: 'red' - antialiasing: true - } -} diff --git a/tests/auto/snippets/data/frame/qtlabscontrols-frame-background.qml b/tests/auto/snippets/data/frame/qtlabscontrols-frame-background.qml new file mode 100644 index 00000000..eec63652 --- /dev/null +++ b/tests/auto/snippets/data/frame/qtlabscontrols-frame-background.qml @@ -0,0 +1,11 @@ +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +Frame { + width: 100 + height: 100 + background: Rectangle { + color: 'transparent' + border.color: 'red' + } +} diff --git a/tests/auto/snippets/data/frame/qtlabscontrols-frame-frame.qml b/tests/auto/snippets/data/frame/qtlabscontrols-frame-frame.qml new file mode 100644 index 00000000..da68ab3c --- /dev/null +++ b/tests/auto/snippets/data/frame/qtlabscontrols-frame-frame.qml @@ -0,0 +1,13 @@ +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +Frame { + width: 100 + height: 100 + Rectangle { + parent: frame + anchors.fill: parent + color: 'transparent' + border.color: 'red' + } +} diff --git a/tests/auto/snippets/data/frame/qtquickcontrols2-frame-background.qml b/tests/auto/snippets/data/frame/qtquickcontrols2-frame-background.qml deleted file mode 100644 index 16d7c892..00000000 --- a/tests/auto/snippets/data/frame/qtquickcontrols2-frame-background.qml +++ /dev/null @@ -1,11 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -Frame { - width: 100 - height: 100 - background: Rectangle { - color: 'transparent' - border.color: 'red' - } -} diff --git a/tests/auto/snippets/data/frame/qtquickcontrols2-frame-frame.qml b/tests/auto/snippets/data/frame/qtquickcontrols2-frame-frame.qml deleted file mode 100644 index 64bfb5fc..00000000 --- a/tests/auto/snippets/data/frame/qtquickcontrols2-frame-frame.qml +++ /dev/null @@ -1,13 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -Frame { - width: 100 - height: 100 - Rectangle { - parent: frame - anchors.fill: parent - color: 'transparent' - border.color: 'red' - } -} diff --git a/tests/auto/snippets/data/groupbox/qtlabscontrols-groupbox-background.qml b/tests/auto/snippets/data/groupbox/qtlabscontrols-groupbox-background.qml new file mode 100644 index 00000000..36359c9d --- /dev/null +++ b/tests/auto/snippets/data/groupbox/qtlabscontrols-groupbox-background.qml @@ -0,0 +1,12 @@ +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +GroupBox { + width: 100 + height: 100 + title: "GroupBox" + background: Rectangle { + color: 'transparent' + border.color: 'red' + } +} diff --git a/tests/auto/snippets/data/groupbox/qtlabscontrols-groupbox-frame.qml b/tests/auto/snippets/data/groupbox/qtlabscontrols-groupbox-frame.qml new file mode 100644 index 00000000..89ae7392 --- /dev/null +++ b/tests/auto/snippets/data/groupbox/qtlabscontrols-groupbox-frame.qml @@ -0,0 +1,14 @@ +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +GroupBox { + width: 100 + height: 100 + title: "GroupBox" + Rectangle { + parent: frame + anchors.fill: parent + color: 'transparent' + border.color: 'red' + } +} diff --git a/tests/auto/snippets/data/groupbox/qtlabscontrols-groupbox-label.qml b/tests/auto/snippets/data/groupbox/qtlabscontrols-groupbox-label.qml new file mode 100644 index 00000000..187e3985 --- /dev/null +++ b/tests/auto/snippets/data/groupbox/qtlabscontrols-groupbox-label.qml @@ -0,0 +1,14 @@ +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +GroupBox { + width: 100 + height: 100 + title: "GroupBox" + Rectangle { + parent: label + anchors.fill: parent + color: 'transparent' + border.color: 'red' + } +} diff --git a/tests/auto/snippets/data/groupbox/qtquickcontrols2-groupbox-background.qml b/tests/auto/snippets/data/groupbox/qtquickcontrols2-groupbox-background.qml deleted file mode 100644 index e986fda5..00000000 --- a/tests/auto/snippets/data/groupbox/qtquickcontrols2-groupbox-background.qml +++ /dev/null @@ -1,12 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -GroupBox { - width: 100 - height: 100 - title: "GroupBox" - background: Rectangle { - color: 'transparent' - border.color: 'red' - } -} diff --git a/tests/auto/snippets/data/groupbox/qtquickcontrols2-groupbox-frame.qml b/tests/auto/snippets/data/groupbox/qtquickcontrols2-groupbox-frame.qml deleted file mode 100644 index 395cd882..00000000 --- a/tests/auto/snippets/data/groupbox/qtquickcontrols2-groupbox-frame.qml +++ /dev/null @@ -1,14 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -GroupBox { - width: 100 - height: 100 - title: "GroupBox" - Rectangle { - parent: frame - anchors.fill: parent - color: 'transparent' - border.color: 'red' - } -} diff --git a/tests/auto/snippets/data/groupbox/qtquickcontrols2-groupbox-label.qml b/tests/auto/snippets/data/groupbox/qtquickcontrols2-groupbox-label.qml deleted file mode 100644 index 00da0450..00000000 --- a/tests/auto/snippets/data/groupbox/qtquickcontrols2-groupbox-label.qml +++ /dev/null @@ -1,14 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -GroupBox { - width: 100 - height: 100 - title: "GroupBox" - Rectangle { - parent: label - anchors.fill: parent - color: 'transparent' - border.color: 'red' - } -} diff --git a/tests/auto/snippets/data/progressbar/qtlabscontrols-progressbar-background.qml b/tests/auto/snippets/data/progressbar/qtlabscontrols-progressbar-background.qml new file mode 100644 index 00000000..c27ab436 --- /dev/null +++ b/tests/auto/snippets/data/progressbar/qtlabscontrols-progressbar-background.qml @@ -0,0 +1,11 @@ +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +ProgressBar { + value: 0.5 + Rectangle { + anchors.fill: background + color: "transparent" + border.color: "red" + } +} diff --git a/tests/auto/snippets/data/progressbar/qtlabscontrols-progressbar-disabled.qml b/tests/auto/snippets/data/progressbar/qtlabscontrols-progressbar-disabled.qml new file mode 100644 index 00000000..100203bd --- /dev/null +++ b/tests/auto/snippets/data/progressbar/qtlabscontrols-progressbar-disabled.qml @@ -0,0 +1,7 @@ +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +ProgressBar { + value: 0.5 + enabled: false +} diff --git a/tests/auto/snippets/data/progressbar/qtlabscontrols-progressbar-indicator.qml b/tests/auto/snippets/data/progressbar/qtlabscontrols-progressbar-indicator.qml new file mode 100644 index 00000000..04cac6f2 --- /dev/null +++ b/tests/auto/snippets/data/progressbar/qtlabscontrols-progressbar-indicator.qml @@ -0,0 +1,13 @@ +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +ProgressBar { + value: 0.5 + Rectangle { + parent: indicator + width: indicator.childrenRect.width + height: indicator.height + color: "transparent" + border.color: "red" + } +} diff --git a/tests/auto/snippets/data/progressbar/qtlabscontrols-progressbar-normal.qml b/tests/auto/snippets/data/progressbar/qtlabscontrols-progressbar-normal.qml new file mode 100644 index 00000000..fd9de49d --- /dev/null +++ b/tests/auto/snippets/data/progressbar/qtlabscontrols-progressbar-normal.qml @@ -0,0 +1,6 @@ +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +ProgressBar { + value: 0.5 +} diff --git a/tests/auto/snippets/data/progressbar/qtquickcontrols2-progressbar-background.qml b/tests/auto/snippets/data/progressbar/qtquickcontrols2-progressbar-background.qml deleted file mode 100644 index 7be2eec5..00000000 --- a/tests/auto/snippets/data/progressbar/qtquickcontrols2-progressbar-background.qml +++ /dev/null @@ -1,11 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -ProgressBar { - value: 0.5 - Rectangle { - anchors.fill: background - color: "transparent" - border.color: "red" - } -} diff --git a/tests/auto/snippets/data/progressbar/qtquickcontrols2-progressbar-disabled.qml b/tests/auto/snippets/data/progressbar/qtquickcontrols2-progressbar-disabled.qml deleted file mode 100644 index 118e2c53..00000000 --- a/tests/auto/snippets/data/progressbar/qtquickcontrols2-progressbar-disabled.qml +++ /dev/null @@ -1,7 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -ProgressBar { - value: 0.5 - enabled: false -} diff --git a/tests/auto/snippets/data/progressbar/qtquickcontrols2-progressbar-indicator.qml b/tests/auto/snippets/data/progressbar/qtquickcontrols2-progressbar-indicator.qml deleted file mode 100644 index 42a58f84..00000000 --- a/tests/auto/snippets/data/progressbar/qtquickcontrols2-progressbar-indicator.qml +++ /dev/null @@ -1,13 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -ProgressBar { - value: 0.5 - Rectangle { - parent: indicator - width: indicator.childrenRect.width - height: indicator.height - color: "transparent" - border.color: "red" - } -} diff --git a/tests/auto/snippets/data/progressbar/qtquickcontrols2-progressbar-normal.qml b/tests/auto/snippets/data/progressbar/qtquickcontrols2-progressbar-normal.qml deleted file mode 100644 index c2b6e89a..00000000 --- a/tests/auto/snippets/data/progressbar/qtquickcontrols2-progressbar-normal.qml +++ /dev/null @@ -1,6 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -ProgressBar { - value: 0.5 -} diff --git a/tests/auto/snippets/data/radiobutton/qtlabscontrols-radiobutton-background.qml b/tests/auto/snippets/data/radiobutton/qtlabscontrols-radiobutton-background.qml new file mode 100644 index 00000000..02409c25 --- /dev/null +++ b/tests/auto/snippets/data/radiobutton/qtlabscontrols-radiobutton-background.qml @@ -0,0 +1,10 @@ +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +RadioButton { + text: "RadioButton" + background: Rectangle { + color: "transparent" + border.color: "red" + } +} diff --git a/tests/auto/snippets/data/radiobutton/qtlabscontrols-radiobutton-checked.qml b/tests/auto/snippets/data/radiobutton/qtlabscontrols-radiobutton-checked.qml new file mode 100644 index 00000000..7cf298c7 --- /dev/null +++ b/tests/auto/snippets/data/radiobutton/qtlabscontrols-radiobutton-checked.qml @@ -0,0 +1,7 @@ +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +RadioButton { + text: "Checked" + checked: true +} diff --git a/tests/auto/snippets/data/radiobutton/qtlabscontrols-radiobutton-disabled.qml b/tests/auto/snippets/data/radiobutton/qtlabscontrols-radiobutton-disabled.qml new file mode 100644 index 00000000..68893856 --- /dev/null +++ b/tests/auto/snippets/data/radiobutton/qtlabscontrols-radiobutton-disabled.qml @@ -0,0 +1,7 @@ +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +RadioButton { + text: "Disabled" + enabled: false +} diff --git a/tests/auto/snippets/data/radiobutton/qtlabscontrols-radiobutton-focused.qml b/tests/auto/snippets/data/radiobutton/qtlabscontrols-radiobutton-focused.qml new file mode 100644 index 00000000..a454ba60 --- /dev/null +++ b/tests/auto/snippets/data/radiobutton/qtlabscontrols-radiobutton-focused.qml @@ -0,0 +1,7 @@ +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +RadioButton { + text: "Focused" + focus: true +} diff --git a/tests/auto/snippets/data/radiobutton/qtlabscontrols-radiobutton-indicator.qml b/tests/auto/snippets/data/radiobutton/qtlabscontrols-radiobutton-indicator.qml new file mode 100644 index 00000000..06259e2f --- /dev/null +++ b/tests/auto/snippets/data/radiobutton/qtlabscontrols-radiobutton-indicator.qml @@ -0,0 +1,11 @@ +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +RadioButton { + text: "RadioButton" + Rectangle { + anchors.fill: indicator + color: "transparent" + border.color: "red" + } +} diff --git a/tests/auto/snippets/data/radiobutton/qtlabscontrols-radiobutton-label.qml b/tests/auto/snippets/data/radiobutton/qtlabscontrols-radiobutton-label.qml new file mode 100644 index 00000000..d761fdd4 --- /dev/null +++ b/tests/auto/snippets/data/radiobutton/qtlabscontrols-radiobutton-label.qml @@ -0,0 +1,11 @@ +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +RadioButton { + text: "RadioButton" + Rectangle { + anchors.fill: label + color: "transparent" + border.color: "red" + } +} diff --git a/tests/auto/snippets/data/radiobutton/qtlabscontrols-radiobutton-normal.qml b/tests/auto/snippets/data/radiobutton/qtlabscontrols-radiobutton-normal.qml new file mode 100644 index 00000000..6f659fb1 --- /dev/null +++ b/tests/auto/snippets/data/radiobutton/qtlabscontrols-radiobutton-normal.qml @@ -0,0 +1,6 @@ +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +RadioButton { + text: "Normal" +} diff --git a/tests/auto/snippets/data/radiobutton/qtquickcontrols2-radiobutton-background.qml b/tests/auto/snippets/data/radiobutton/qtquickcontrols2-radiobutton-background.qml deleted file mode 100644 index 8ea70c8d..00000000 --- a/tests/auto/snippets/data/radiobutton/qtquickcontrols2-radiobutton-background.qml +++ /dev/null @@ -1,10 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -RadioButton { - text: "RadioButton" - background: Rectangle { - color: "transparent" - border.color: "red" - } -} diff --git a/tests/auto/snippets/data/radiobutton/qtquickcontrols2-radiobutton-checked.qml b/tests/auto/snippets/data/radiobutton/qtquickcontrols2-radiobutton-checked.qml deleted file mode 100644 index 2e475807..00000000 --- a/tests/auto/snippets/data/radiobutton/qtquickcontrols2-radiobutton-checked.qml +++ /dev/null @@ -1,7 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -RadioButton { - text: "Checked" - checked: true -} diff --git a/tests/auto/snippets/data/radiobutton/qtquickcontrols2-radiobutton-disabled.qml b/tests/auto/snippets/data/radiobutton/qtquickcontrols2-radiobutton-disabled.qml deleted file mode 100644 index 357fbe57..00000000 --- a/tests/auto/snippets/data/radiobutton/qtquickcontrols2-radiobutton-disabled.qml +++ /dev/null @@ -1,7 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -RadioButton { - text: "Disabled" - enabled: false -} diff --git a/tests/auto/snippets/data/radiobutton/qtquickcontrols2-radiobutton-focused.qml b/tests/auto/snippets/data/radiobutton/qtquickcontrols2-radiobutton-focused.qml deleted file mode 100644 index 981f908c..00000000 --- a/tests/auto/snippets/data/radiobutton/qtquickcontrols2-radiobutton-focused.qml +++ /dev/null @@ -1,7 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -RadioButton { - text: "Focused" - focus: true -} diff --git a/tests/auto/snippets/data/radiobutton/qtquickcontrols2-radiobutton-indicator.qml b/tests/auto/snippets/data/radiobutton/qtquickcontrols2-radiobutton-indicator.qml deleted file mode 100644 index 8f781695..00000000 --- a/tests/auto/snippets/data/radiobutton/qtquickcontrols2-radiobutton-indicator.qml +++ /dev/null @@ -1,11 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -RadioButton { - text: "RadioButton" - Rectangle { - anchors.fill: indicator - color: "transparent" - border.color: "red" - } -} diff --git a/tests/auto/snippets/data/radiobutton/qtquickcontrols2-radiobutton-label.qml b/tests/auto/snippets/data/radiobutton/qtquickcontrols2-radiobutton-label.qml deleted file mode 100644 index 085f34f0..00000000 --- a/tests/auto/snippets/data/radiobutton/qtquickcontrols2-radiobutton-label.qml +++ /dev/null @@ -1,11 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -RadioButton { - text: "RadioButton" - Rectangle { - anchors.fill: label - color: "transparent" - border.color: "red" - } -} diff --git a/tests/auto/snippets/data/radiobutton/qtquickcontrols2-radiobutton-normal.qml b/tests/auto/snippets/data/radiobutton/qtquickcontrols2-radiobutton-normal.qml deleted file mode 100644 index 8f61856f..00000000 --- a/tests/auto/snippets/data/radiobutton/qtquickcontrols2-radiobutton-normal.qml +++ /dev/null @@ -1,6 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -RadioButton { - text: "Normal" -} diff --git a/tests/auto/snippets/data/scrollbar/qtlabscontrols-scrollbar-background.qml b/tests/auto/snippets/data/scrollbar/qtlabscontrols-scrollbar-background.qml new file mode 100644 index 00000000..21020f3d --- /dev/null +++ b/tests/auto/snippets/data/scrollbar/qtlabscontrols-scrollbar-background.qml @@ -0,0 +1,13 @@ +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +ScrollBar { + size: 0.5 + position: 0.5 + active: true + height: 100 + background: Rectangle { + color: "transparent" + border.color: "red" + } +} diff --git a/tests/auto/snippets/data/scrollbar/qtlabscontrols-scrollbar-handle.qml b/tests/auto/snippets/data/scrollbar/qtlabscontrols-scrollbar-handle.qml new file mode 100644 index 00000000..12ff8b10 --- /dev/null +++ b/tests/auto/snippets/data/scrollbar/qtlabscontrols-scrollbar-handle.qml @@ -0,0 +1,15 @@ +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +ScrollBar { + size: 0.5 + position: 0.5 + active: true + height: 100 + Rectangle { + parent: handle + anchors.fill: parent + color: "transparent" + border.color: "red" + } +} diff --git a/tests/auto/snippets/data/scrollbar/qtquickcontrols2-scrollbar-background.qml b/tests/auto/snippets/data/scrollbar/qtquickcontrols2-scrollbar-background.qml deleted file mode 100644 index e466a36f..00000000 --- a/tests/auto/snippets/data/scrollbar/qtquickcontrols2-scrollbar-background.qml +++ /dev/null @@ -1,13 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -ScrollBar { - size: 0.5 - position: 0.5 - active: true - height: 100 - background: Rectangle { - color: "transparent" - border.color: "red" - } -} diff --git a/tests/auto/snippets/data/scrollbar/qtquickcontrols2-scrollbar-handle.qml b/tests/auto/snippets/data/scrollbar/qtquickcontrols2-scrollbar-handle.qml deleted file mode 100644 index 3efbab88..00000000 --- a/tests/auto/snippets/data/scrollbar/qtquickcontrols2-scrollbar-handle.qml +++ /dev/null @@ -1,15 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -ScrollBar { - size: 0.5 - position: 0.5 - active: true - height: 100 - Rectangle { - parent: handle - anchors.fill: parent - color: "transparent" - border.color: "red" - } -} diff --git a/tests/auto/snippets/data/scrollindicator/qtlabscontrols-scrollindicator-background.qml b/tests/auto/snippets/data/scrollindicator/qtlabscontrols-scrollindicator-background.qml new file mode 100644 index 00000000..991751af --- /dev/null +++ b/tests/auto/snippets/data/scrollindicator/qtlabscontrols-scrollindicator-background.qml @@ -0,0 +1,13 @@ +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +ScrollIndicator { + size: 0.5 + position: 0.5 + active: true + height: 100 + background: Rectangle { + color: "transparent" + border.color: "red" + } +} diff --git a/tests/auto/snippets/data/scrollindicator/qtlabscontrols-scrollindicator-indicator.qml b/tests/auto/snippets/data/scrollindicator/qtlabscontrols-scrollindicator-indicator.qml new file mode 100644 index 00000000..e615ea33 --- /dev/null +++ b/tests/auto/snippets/data/scrollindicator/qtlabscontrols-scrollindicator-indicator.qml @@ -0,0 +1,15 @@ +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +ScrollIndicator { + size: 0.5 + position: 0.5 + active: true + height: 100 + Rectangle { + parent: indicator + anchors.fill: parent + color: "transparent" + border.color: "red" + } +} diff --git a/tests/auto/snippets/data/scrollindicator/qtquickcontrols2-scrollindicator-background.qml b/tests/auto/snippets/data/scrollindicator/qtquickcontrols2-scrollindicator-background.qml deleted file mode 100644 index 112f9a55..00000000 --- a/tests/auto/snippets/data/scrollindicator/qtquickcontrols2-scrollindicator-background.qml +++ /dev/null @@ -1,13 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -ScrollIndicator { - size: 0.5 - position: 0.5 - active: true - height: 100 - background: Rectangle { - color: "transparent" - border.color: "red" - } -} diff --git a/tests/auto/snippets/data/scrollindicator/qtquickcontrols2-scrollindicator-indicator.qml b/tests/auto/snippets/data/scrollindicator/qtquickcontrols2-scrollindicator-indicator.qml deleted file mode 100644 index 0a90ae54..00000000 --- a/tests/auto/snippets/data/scrollindicator/qtquickcontrols2-scrollindicator-indicator.qml +++ /dev/null @@ -1,15 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -ScrollIndicator { - size: 0.5 - position: 0.5 - active: true - height: 100 - Rectangle { - parent: indicator - anchors.fill: parent - color: "transparent" - border.color: "red" - } -} diff --git a/tests/auto/snippets/data/slider/qtlabscontrols-slider-background.qml b/tests/auto/snippets/data/slider/qtlabscontrols-slider-background.qml new file mode 100644 index 00000000..d6344f72 --- /dev/null +++ b/tests/auto/snippets/data/slider/qtlabscontrols-slider-background.qml @@ -0,0 +1,10 @@ +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +Slider { + value: 0.5 + background: Rectangle { + color: "transparent" + border.color: "red" + } +} diff --git a/tests/auto/snippets/data/slider/qtlabscontrols-slider-disabled.qml b/tests/auto/snippets/data/slider/qtlabscontrols-slider-disabled.qml new file mode 100644 index 00000000..57053ce6 --- /dev/null +++ b/tests/auto/snippets/data/slider/qtlabscontrols-slider-disabled.qml @@ -0,0 +1,7 @@ +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +Slider { + value: 0.5 + enabled: false +} diff --git a/tests/auto/snippets/data/slider/qtlabscontrols-slider-focused.qml b/tests/auto/snippets/data/slider/qtlabscontrols-slider-focused.qml new file mode 100644 index 00000000..d2f7fd09 --- /dev/null +++ b/tests/auto/snippets/data/slider/qtlabscontrols-slider-focused.qml @@ -0,0 +1,7 @@ +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +Slider { + value: 0.5 + focus: true +} diff --git a/tests/auto/snippets/data/slider/qtlabscontrols-slider-handle.qml b/tests/auto/snippets/data/slider/qtlabscontrols-slider-handle.qml new file mode 100644 index 00000000..9e578207 --- /dev/null +++ b/tests/auto/snippets/data/slider/qtlabscontrols-slider-handle.qml @@ -0,0 +1,11 @@ +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +Slider { + value: 0.5 + Rectangle { + anchors.fill: handle + color: "transparent" + border.color: "red" + } +} diff --git a/tests/auto/snippets/data/slider/qtlabscontrols-slider-normal.qml b/tests/auto/snippets/data/slider/qtlabscontrols-slider-normal.qml new file mode 100644 index 00000000..8467aa59 --- /dev/null +++ b/tests/auto/snippets/data/slider/qtlabscontrols-slider-normal.qml @@ -0,0 +1,6 @@ +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +Slider { + value: 0.5 +} diff --git a/tests/auto/snippets/data/slider/qtlabscontrols-slider-track.qml b/tests/auto/snippets/data/slider/qtlabscontrols-slider-track.qml new file mode 100644 index 00000000..3a85f46e --- /dev/null +++ b/tests/auto/snippets/data/slider/qtlabscontrols-slider-track.qml @@ -0,0 +1,11 @@ +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +Slider { + value: 0.5 + Rectangle { + anchors.fill: track + color: "transparent" + border.color: "red" + } +} diff --git a/tests/auto/snippets/data/slider/qtquickcontrols2-slider-background.qml b/tests/auto/snippets/data/slider/qtquickcontrols2-slider-background.qml deleted file mode 100644 index 687dbea0..00000000 --- a/tests/auto/snippets/data/slider/qtquickcontrols2-slider-background.qml +++ /dev/null @@ -1,10 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -Slider { - value: 0.5 - background: Rectangle { - color: "transparent" - border.color: "red" - } -} diff --git a/tests/auto/snippets/data/slider/qtquickcontrols2-slider-disabled.qml b/tests/auto/snippets/data/slider/qtquickcontrols2-slider-disabled.qml deleted file mode 100644 index 5b5532cc..00000000 --- a/tests/auto/snippets/data/slider/qtquickcontrols2-slider-disabled.qml +++ /dev/null @@ -1,7 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -Slider { - value: 0.5 - enabled: false -} diff --git a/tests/auto/snippets/data/slider/qtquickcontrols2-slider-focused.qml b/tests/auto/snippets/data/slider/qtquickcontrols2-slider-focused.qml deleted file mode 100644 index f060dbe5..00000000 --- a/tests/auto/snippets/data/slider/qtquickcontrols2-slider-focused.qml +++ /dev/null @@ -1,7 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -Slider { - value: 0.5 - focus: true -} diff --git a/tests/auto/snippets/data/slider/qtquickcontrols2-slider-handle.qml b/tests/auto/snippets/data/slider/qtquickcontrols2-slider-handle.qml deleted file mode 100644 index e24cd664..00000000 --- a/tests/auto/snippets/data/slider/qtquickcontrols2-slider-handle.qml +++ /dev/null @@ -1,11 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -Slider { - value: 0.5 - Rectangle { - anchors.fill: handle - color: "transparent" - border.color: "red" - } -} diff --git a/tests/auto/snippets/data/slider/qtquickcontrols2-slider-normal.qml b/tests/auto/snippets/data/slider/qtquickcontrols2-slider-normal.qml deleted file mode 100644 index 50ba0637..00000000 --- a/tests/auto/snippets/data/slider/qtquickcontrols2-slider-normal.qml +++ /dev/null @@ -1,6 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -Slider { - value: 0.5 -} diff --git a/tests/auto/snippets/data/slider/qtquickcontrols2-slider-track.qml b/tests/auto/snippets/data/slider/qtquickcontrols2-slider-track.qml deleted file mode 100644 index e8f00c7c..00000000 --- a/tests/auto/snippets/data/slider/qtquickcontrols2-slider-track.qml +++ /dev/null @@ -1,11 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -Slider { - value: 0.5 - Rectangle { - anchors.fill: track - color: "transparent" - border.color: "red" - } -} diff --git a/tests/auto/snippets/data/switch/qtlabscontrols-switch-background.qml b/tests/auto/snippets/data/switch/qtlabscontrols-switch-background.qml new file mode 100644 index 00000000..34342187 --- /dev/null +++ b/tests/auto/snippets/data/switch/qtlabscontrols-switch-background.qml @@ -0,0 +1,10 @@ +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +Switch { + text: "Switch" + background: Rectangle { + color: "transparent" + border.color: "red" + } +} diff --git a/tests/auto/snippets/data/switch/qtlabscontrols-switch-checked.qml b/tests/auto/snippets/data/switch/qtlabscontrols-switch-checked.qml new file mode 100644 index 00000000..6c82fae3 --- /dev/null +++ b/tests/auto/snippets/data/switch/qtlabscontrols-switch-checked.qml @@ -0,0 +1,7 @@ +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +Switch { + text: "Checked" + checked: true +} diff --git a/tests/auto/snippets/data/switch/qtlabscontrols-switch-disabled.qml b/tests/auto/snippets/data/switch/qtlabscontrols-switch-disabled.qml new file mode 100644 index 00000000..3ebc5d72 --- /dev/null +++ b/tests/auto/snippets/data/switch/qtlabscontrols-switch-disabled.qml @@ -0,0 +1,7 @@ +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +Switch { + text: "Disabled" + enabled: false +} diff --git a/tests/auto/snippets/data/switch/qtlabscontrols-switch-focused.qml b/tests/auto/snippets/data/switch/qtlabscontrols-switch-focused.qml new file mode 100644 index 00000000..fc3564f2 --- /dev/null +++ b/tests/auto/snippets/data/switch/qtlabscontrols-switch-focused.qml @@ -0,0 +1,7 @@ +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +Switch { + text: "Focused" + focus: true +} diff --git a/tests/auto/snippets/data/switch/qtlabscontrols-switch-indicator.qml b/tests/auto/snippets/data/switch/qtlabscontrols-switch-indicator.qml new file mode 100644 index 00000000..f3d01aba --- /dev/null +++ b/tests/auto/snippets/data/switch/qtlabscontrols-switch-indicator.qml @@ -0,0 +1,11 @@ +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +Switch { + text: "Switch" + Rectangle { + anchors.fill: indicator + color: "transparent" + border.color: "red" + } +} diff --git a/tests/auto/snippets/data/switch/qtlabscontrols-switch-label.qml b/tests/auto/snippets/data/switch/qtlabscontrols-switch-label.qml new file mode 100644 index 00000000..54e41ef7 --- /dev/null +++ b/tests/auto/snippets/data/switch/qtlabscontrols-switch-label.qml @@ -0,0 +1,11 @@ +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +Switch { + text: "Switch" + Rectangle { + anchors.fill: label + color: "transparent" + border.color: "red" + } +} diff --git a/tests/auto/snippets/data/switch/qtlabscontrols-switch-normal.qml b/tests/auto/snippets/data/switch/qtlabscontrols-switch-normal.qml new file mode 100644 index 00000000..75400351 --- /dev/null +++ b/tests/auto/snippets/data/switch/qtlabscontrols-switch-normal.qml @@ -0,0 +1,6 @@ +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +Switch { + text: "Normal" +} diff --git a/tests/auto/snippets/data/switch/qtquickcontrols2-switch-background.qml b/tests/auto/snippets/data/switch/qtquickcontrols2-switch-background.qml deleted file mode 100644 index 7ed7ccc1..00000000 --- a/tests/auto/snippets/data/switch/qtquickcontrols2-switch-background.qml +++ /dev/null @@ -1,10 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -Switch { - text: "Switch" - background: Rectangle { - color: "transparent" - border.color: "red" - } -} diff --git a/tests/auto/snippets/data/switch/qtquickcontrols2-switch-checked.qml b/tests/auto/snippets/data/switch/qtquickcontrols2-switch-checked.qml deleted file mode 100644 index 74ed3f50..00000000 --- a/tests/auto/snippets/data/switch/qtquickcontrols2-switch-checked.qml +++ /dev/null @@ -1,7 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -Switch { - text: "Checked" - checked: true -} diff --git a/tests/auto/snippets/data/switch/qtquickcontrols2-switch-disabled.qml b/tests/auto/snippets/data/switch/qtquickcontrols2-switch-disabled.qml deleted file mode 100644 index 5c1e9234..00000000 --- a/tests/auto/snippets/data/switch/qtquickcontrols2-switch-disabled.qml +++ /dev/null @@ -1,7 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -Switch { - text: "Disabled" - enabled: false -} diff --git a/tests/auto/snippets/data/switch/qtquickcontrols2-switch-focused.qml b/tests/auto/snippets/data/switch/qtquickcontrols2-switch-focused.qml deleted file mode 100644 index 581cdbcf..00000000 --- a/tests/auto/snippets/data/switch/qtquickcontrols2-switch-focused.qml +++ /dev/null @@ -1,7 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -Switch { - text: "Focused" - focus: true -} diff --git a/tests/auto/snippets/data/switch/qtquickcontrols2-switch-indicator.qml b/tests/auto/snippets/data/switch/qtquickcontrols2-switch-indicator.qml deleted file mode 100644 index b13ef6ac..00000000 --- a/tests/auto/snippets/data/switch/qtquickcontrols2-switch-indicator.qml +++ /dev/null @@ -1,11 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -Switch { - text: "Switch" - Rectangle { - anchors.fill: indicator - color: "transparent" - border.color: "red" - } -} diff --git a/tests/auto/snippets/data/switch/qtquickcontrols2-switch-label.qml b/tests/auto/snippets/data/switch/qtquickcontrols2-switch-label.qml deleted file mode 100644 index 2ccae69d..00000000 --- a/tests/auto/snippets/data/switch/qtquickcontrols2-switch-label.qml +++ /dev/null @@ -1,11 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -Switch { - text: "Switch" - Rectangle { - anchors.fill: label - color: "transparent" - border.color: "red" - } -} diff --git a/tests/auto/snippets/data/switch/qtquickcontrols2-switch-normal.qml b/tests/auto/snippets/data/switch/qtquickcontrols2-switch-normal.qml deleted file mode 100644 index c403a378..00000000 --- a/tests/auto/snippets/data/switch/qtquickcontrols2-switch-normal.qml +++ /dev/null @@ -1,6 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -Switch { - text: "Normal" -} diff --git a/tests/auto/snippets/data/textfield/qtlabscontrols-textfield-background.qml b/tests/auto/snippets/data/textfield/qtlabscontrols-textfield-background.qml new file mode 100644 index 00000000..6fcc3391 --- /dev/null +++ b/tests/auto/snippets/data/textfield/qtlabscontrols-textfield-background.qml @@ -0,0 +1,12 @@ +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +TextField { + width: 80 + text: "TextField" + Rectangle { + anchors.fill: background + color: 'transparent' + border.color: 'red' + } +} diff --git a/tests/auto/snippets/data/textfield/qtlabscontrols-textfield-disabled.qml b/tests/auto/snippets/data/textfield/qtlabscontrols-textfield-disabled.qml new file mode 100644 index 00000000..bec044f7 --- /dev/null +++ b/tests/auto/snippets/data/textfield/qtlabscontrols-textfield-disabled.qml @@ -0,0 +1,8 @@ +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +TextField { + width: 80 + text: "Disabled" + enabled: false +} diff --git a/tests/auto/snippets/data/textfield/qtlabscontrols-textfield-focused.qml b/tests/auto/snippets/data/textfield/qtlabscontrols-textfield-focused.qml new file mode 100644 index 00000000..7983e104 --- /dev/null +++ b/tests/auto/snippets/data/textfield/qtlabscontrols-textfield-focused.qml @@ -0,0 +1,8 @@ +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +TextField { + width: 80 + text: "Focused" + focus: true +} diff --git a/tests/auto/snippets/data/textfield/qtlabscontrols-textfield-normal.qml b/tests/auto/snippets/data/textfield/qtlabscontrols-textfield-normal.qml new file mode 100644 index 00000000..81b18874 --- /dev/null +++ b/tests/auto/snippets/data/textfield/qtlabscontrols-textfield-normal.qml @@ -0,0 +1,7 @@ +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +TextField { + width: 80 + text: "Normal" +} diff --git a/tests/auto/snippets/data/textfield/qtlabscontrols-textfield-placeholder.qml b/tests/auto/snippets/data/textfield/qtlabscontrols-textfield-placeholder.qml new file mode 100644 index 00000000..ef20c5e2 --- /dev/null +++ b/tests/auto/snippets/data/textfield/qtlabscontrols-textfield-placeholder.qml @@ -0,0 +1,12 @@ +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +TextField { + width: 80 + text: "TextField" + Rectangle { + anchors.fill: placeholder + color: 'transparent' + border.color: 'red' + } +} diff --git a/tests/auto/snippets/data/textfield/qtquickcontrols2-textfield-background.qml b/tests/auto/snippets/data/textfield/qtquickcontrols2-textfield-background.qml deleted file mode 100644 index ee71a015..00000000 --- a/tests/auto/snippets/data/textfield/qtquickcontrols2-textfield-background.qml +++ /dev/null @@ -1,12 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -TextField { - width: 80 - text: "TextField" - Rectangle { - anchors.fill: background - color: 'transparent' - border.color: 'red' - } -} diff --git a/tests/auto/snippets/data/textfield/qtquickcontrols2-textfield-disabled.qml b/tests/auto/snippets/data/textfield/qtquickcontrols2-textfield-disabled.qml deleted file mode 100644 index 76ba54ed..00000000 --- a/tests/auto/snippets/data/textfield/qtquickcontrols2-textfield-disabled.qml +++ /dev/null @@ -1,8 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -TextField { - width: 80 - text: "Disabled" - enabled: false -} diff --git a/tests/auto/snippets/data/textfield/qtquickcontrols2-textfield-focused.qml b/tests/auto/snippets/data/textfield/qtquickcontrols2-textfield-focused.qml deleted file mode 100644 index f9db3c5a..00000000 --- a/tests/auto/snippets/data/textfield/qtquickcontrols2-textfield-focused.qml +++ /dev/null @@ -1,8 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -TextField { - width: 80 - text: "Focused" - focus: true -} diff --git a/tests/auto/snippets/data/textfield/qtquickcontrols2-textfield-normal.qml b/tests/auto/snippets/data/textfield/qtquickcontrols2-textfield-normal.qml deleted file mode 100644 index a81f35e8..00000000 --- a/tests/auto/snippets/data/textfield/qtquickcontrols2-textfield-normal.qml +++ /dev/null @@ -1,7 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -TextField { - width: 80 - text: "Normal" -} diff --git a/tests/auto/snippets/data/textfield/qtquickcontrols2-textfield-placeholder.qml b/tests/auto/snippets/data/textfield/qtquickcontrols2-textfield-placeholder.qml deleted file mode 100644 index 89d814a6..00000000 --- a/tests/auto/snippets/data/textfield/qtquickcontrols2-textfield-placeholder.qml +++ /dev/null @@ -1,12 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -TextField { - width: 80 - text: "TextField" - Rectangle { - anchors.fill: placeholder - color: 'transparent' - border.color: 'red' - } -} diff --git a/tests/auto/snippets/data/toolbar/qtlabscontrols-toolbar-background.qml b/tests/auto/snippets/data/toolbar/qtlabscontrols-toolbar-background.qml new file mode 100644 index 00000000..d9cc05c9 --- /dev/null +++ b/tests/auto/snippets/data/toolbar/qtlabscontrols-toolbar-background.qml @@ -0,0 +1,12 @@ +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +ToolBar { + width: 100 + Rectangle { + parent: background + anchors.fill: parent + color: 'transparent' + border.color: 'red' + } +} diff --git a/tests/auto/snippets/data/toolbar/qtlabscontrols-toolbar-frame.qml b/tests/auto/snippets/data/toolbar/qtlabscontrols-toolbar-frame.qml new file mode 100644 index 00000000..2a064bd6 --- /dev/null +++ b/tests/auto/snippets/data/toolbar/qtlabscontrols-toolbar-frame.qml @@ -0,0 +1,11 @@ +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +ToolBar { + width: 100 + frame: Rectangle { + anchors.fill: parent + color: 'transparent' + border.color: 'red' + } +} diff --git a/tests/auto/snippets/data/toolbar/qtquickcontrols2-toolbar-background.qml b/tests/auto/snippets/data/toolbar/qtquickcontrols2-toolbar-background.qml deleted file mode 100644 index 856f113a..00000000 --- a/tests/auto/snippets/data/toolbar/qtquickcontrols2-toolbar-background.qml +++ /dev/null @@ -1,12 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -ToolBar { - width: 100 - Rectangle { - parent: background - anchors.fill: parent - color: 'transparent' - border.color: 'red' - } -} diff --git a/tests/auto/snippets/data/toolbar/qtquickcontrols2-toolbar-frame.qml b/tests/auto/snippets/data/toolbar/qtquickcontrols2-toolbar-frame.qml deleted file mode 100644 index f0f64f82..00000000 --- a/tests/auto/snippets/data/toolbar/qtquickcontrols2-toolbar-frame.qml +++ /dev/null @@ -1,11 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -ToolBar { - width: 100 - frame: Rectangle { - anchors.fill: parent - color: 'transparent' - border.color: 'red' - } -} diff --git a/tests/auto/snippets/data/toolbutton/qtlabscontrols-toolbutton-background.qml b/tests/auto/snippets/data/toolbutton/qtlabscontrols-toolbutton-background.qml new file mode 100644 index 00000000..8a1f8474 --- /dev/null +++ b/tests/auto/snippets/data/toolbutton/qtlabscontrols-toolbutton-background.qml @@ -0,0 +1,11 @@ +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +ToolButton { + text: "ToolButton" + Rectangle { + anchors.fill: background + color: 'transparent' + border.color: 'red' + } +} diff --git a/tests/auto/snippets/data/toolbutton/qtlabscontrols-toolbutton-label.qml b/tests/auto/snippets/data/toolbutton/qtlabscontrols-toolbutton-label.qml new file mode 100644 index 00000000..6872b38c --- /dev/null +++ b/tests/auto/snippets/data/toolbutton/qtlabscontrols-toolbutton-label.qml @@ -0,0 +1,11 @@ +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +ToolButton { + text: "ToolButton" + Rectangle { + anchors.fill: label + color: 'transparent' + border.color: 'red' + } +} diff --git a/tests/auto/snippets/data/toolbutton/qtquickcontrols2-toolbutton-background.qml b/tests/auto/snippets/data/toolbutton/qtquickcontrols2-toolbutton-background.qml deleted file mode 100644 index 4485bfb5..00000000 --- a/tests/auto/snippets/data/toolbutton/qtquickcontrols2-toolbutton-background.qml +++ /dev/null @@ -1,11 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -ToolButton { - text: "ToolButton" - Rectangle { - anchors.fill: background - color: 'transparent' - border.color: 'red' - } -} diff --git a/tests/auto/snippets/data/toolbutton/qtquickcontrols2-toolbutton-label.qml b/tests/auto/snippets/data/toolbutton/qtquickcontrols2-toolbutton-label.qml deleted file mode 100644 index 17084ced..00000000 --- a/tests/auto/snippets/data/toolbutton/qtquickcontrols2-toolbutton-label.qml +++ /dev/null @@ -1,11 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -ToolButton { - text: "ToolButton" - Rectangle { - anchors.fill: label - color: 'transparent' - border.color: 'red' - } -} diff --git a/tests/auto/snippets/data/tumbler/qtlabscontrols-tumbler-background.qml b/tests/auto/snippets/data/tumbler/qtlabscontrols-tumbler-background.qml new file mode 100644 index 00000000..02b8a2f9 --- /dev/null +++ b/tests/auto/snippets/data/tumbler/qtlabscontrols-tumbler-background.qml @@ -0,0 +1,12 @@ +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +Tumbler { + model: 5 + + Rectangle { + anchors.fill: parent + color: 'transparent' + border.color: 'red' + } +} diff --git a/tests/auto/snippets/data/tumbler/qtlabscontrols-tumbler-contentItem.qml b/tests/auto/snippets/data/tumbler/qtlabscontrols-tumbler-contentItem.qml new file mode 100644 index 00000000..6ef5099c --- /dev/null +++ b/tests/auto/snippets/data/tumbler/qtlabscontrols-tumbler-contentItem.qml @@ -0,0 +1,12 @@ +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +Tumbler { + model: 5 + + Rectangle { + anchors.fill: parent.contentItem + color: 'transparent' + border.color: 'red' + } +} diff --git a/tests/auto/snippets/data/tumbler/qtlabscontrols-tumbler-delegate.qml b/tests/auto/snippets/data/tumbler/qtlabscontrols-tumbler-delegate.qml new file mode 100644 index 00000000..593e7302 --- /dev/null +++ b/tests/auto/snippets/data/tumbler/qtlabscontrols-tumbler-delegate.qml @@ -0,0 +1,20 @@ +import QtQuick 2.0 +import Qt.labs.controls 1.0 + +Tumbler { + id: tumbler + model: 5 + + Column { + Repeater { + model: 3 + + Rectangle { + width: tumbler.contentItem.width + height: tumbler.contentItem.height / 3 + color: 'transparent' + border.color: 'red' + } + } + } +} diff --git a/tests/auto/snippets/data/tumbler/qtquickcontrols2-tumbler-background.qml b/tests/auto/snippets/data/tumbler/qtquickcontrols2-tumbler-background.qml deleted file mode 100644 index 5a9832c4..00000000 --- a/tests/auto/snippets/data/tumbler/qtquickcontrols2-tumbler-background.qml +++ /dev/null @@ -1,12 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -Tumbler { - model: 5 - - Rectangle { - anchors.fill: parent - color: 'transparent' - border.color: 'red' - } -} diff --git a/tests/auto/snippets/data/tumbler/qtquickcontrols2-tumbler-contentItem.qml b/tests/auto/snippets/data/tumbler/qtquickcontrols2-tumbler-contentItem.qml deleted file mode 100644 index 51a0a7bb..00000000 --- a/tests/auto/snippets/data/tumbler/qtquickcontrols2-tumbler-contentItem.qml +++ /dev/null @@ -1,12 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -Tumbler { - model: 5 - - Rectangle { - anchors.fill: parent.contentItem - color: 'transparent' - border.color: 'red' - } -} diff --git a/tests/auto/snippets/data/tumbler/qtquickcontrols2-tumbler-delegate.qml b/tests/auto/snippets/data/tumbler/qtquickcontrols2-tumbler-delegate.qml deleted file mode 100644 index d7f02c0c..00000000 --- a/tests/auto/snippets/data/tumbler/qtquickcontrols2-tumbler-delegate.qml +++ /dev/null @@ -1,20 +0,0 @@ -import QtQuick 2.0 -import QtQuick.Controls 2.0 - -Tumbler { - id: tumbler - model: 5 - - Column { - Repeater { - model: 3 - - Rectangle { - width: tumbler.contentItem.width - height: tumbler.contentItem.height / 3 - color: 'transparent' - border.color: 'red' - } - } - } -} diff --git a/tests/benchmarks/creationtime/tst_creationtime.cpp b/tests/benchmarks/creationtime/tst_creationtime.cpp index 5d8d9b1c..32ba17ff 100644 --- a/tests/benchmarks/creationtime/tst_creationtime.cpp +++ b/tests/benchmarks/creationtime/tst_creationtime.cpp @@ -101,14 +101,14 @@ void tst_CreationTime::controls() { QFETCH(QByteArray, control); QQmlComponent component(&engine); - component.setData("import QtQuick.Controls 2.0;" + control + "{}", QUrl()); + component.setData("import Qt.labs.controls 1.0;" + control + "{}", QUrl()); doBenchmark(&component); } void tst_CreationTime::controls_data() { QTest::addColumn("control"); - addTestRows(engine.importPathList(), "QtQuick/Controls.2"); + addTestRows(engine.importPathList(), "Qt/labs/controls"); } void tst_CreationTime::calendar() diff --git a/tests/benchmarks/objectcount/tst_objectcount.cpp b/tests/benchmarks/objectcount/tst_objectcount.cpp index 49400c22..039b5d1f 100644 --- a/tests/benchmarks/objectcount/tst_objectcount.cpp +++ b/tests/benchmarks/objectcount/tst_objectcount.cpp @@ -74,7 +74,7 @@ void tst_ObjectCount::init() // warmup QQmlComponent component(&engine); - component.setData("import QtQuick 2.0; import QtQuick.Controls 1.3 as C1; import QtQuick.Controls 2.0 as C2; Row { C1.Button {} C2.Button {} }", QUrl()); + component.setData("import QtQuick 2.0; import QtQuick.Controls 1.3 as C1; import Qt.labs.controls 1.0 as C2; Row { C1.Button {} C2.Button {} }", QUrl()); delete component.create(); } @@ -143,43 +143,43 @@ void tst_ObjectCount::testCount_data() QTest::newRow("ApplicationWindow") << QByteArray("import QtQuick.Controls 1.3; ApplicationWindow { }") - << QByteArray("import QtQuick.Controls 2.0; ApplicationWindow { }"); + << QByteArray("import Qt.labs.controls 1.0; ApplicationWindow { }"); QTest::newRow("BusyIndicator") << QByteArray("import QtQuick.Controls 1.3; BusyIndicator { }") - << QByteArray("import QtQuick.Controls 2.0; BusyIndicator { }"); + << QByteArray("import Qt.labs.controls 1.0; BusyIndicator { }"); QTest::newRow("Button") << QByteArray("import QtQuick.Controls 1.3; Button { }") - << QByteArray("import QtQuick.Controls 2.0; Button { }"); + << QByteArray("import Qt.labs.controls 1.0; Button { }"); QTest::newRow("CheckBox") << QByteArray("import QtQuick.Controls 1.3; CheckBox { }") - << QByteArray("import QtQuick.Controls 2.0; CheckBox { }"); + << QByteArray("import Qt.labs.controls 1.0; CheckBox { }"); QTest::newRow("Frame") << QByteArray() - << QByteArray("import QtQuick.Controls 2.0; Frame { }"); + << QByteArray("import Qt.labs.controls 1.0; Frame { }"); QTest::newRow("GroupBox") << QByteArray("import QtQuick.Controls 1.3; GroupBox { }") - << QByteArray("import QtQuick.Controls 2.0; GroupBox { }"); + << QByteArray("import Qt.labs.controls 1.0; GroupBox { }"); QTest::newRow("Label") << QByteArray("import QtQuick.Controls 1.3; Label { }") - << QByteArray("import QtQuick.Controls 2.0; Label { }"); + << QByteArray("import Qt.labs.controls 1.0; Label { }"); QTest::newRow("PageIndicator") << QByteArray() - << QByteArray("import QtQuick.Controls 2.0; PageIndicator { }"); + << QByteArray("import Qt.labs.controls 1.0; PageIndicator { }"); QTest::newRow("ProgressBar") << QByteArray("import QtQuick.Controls 1.3; ProgressBar { }") - << QByteArray("import QtQuick.Controls 2.0; ProgressBar { }"); + << QByteArray("import Qt.labs.controls 1.0; ProgressBar { }"); QTest::newRow("RadioButton") << QByteArray("import QtQuick.Controls 1.3; RadioButton { }") - << QByteArray("import QtQuick.Controls 2.0; RadioButton { }"); + << QByteArray("import Qt.labs.controls 1.0; RadioButton { }"); QTest::newRow("ScrollView") << QByteArray("import QtQuick.Controls 1.3; ScrollView { }") @@ -187,47 +187,47 @@ void tst_ObjectCount::testCount_data() QTest::newRow("ScrollIndicator") << QByteArray() - << QByteArray("import QtQuick.Controls 2.0; ScrollIndicator { }"); + << QByteArray("import Qt.labs.controls 1.0; ScrollIndicator { }"); QTest::newRow("ScrollBar") << QByteArray() - << QByteArray("import QtQuick.Controls 2.0; ScrollBar { }"); + << QByteArray("import Qt.labs.controls 1.0; ScrollBar { }"); QTest::newRow("Slider") << QByteArray("import QtQuick.Controls 1.3; Slider { }") - << QByteArray("import QtQuick.Controls 2.0; Slider { }"); + << QByteArray("import Qt.labs.controls 1.0; Slider { }"); QTest::newRow("StackView") << QByteArray("import QtQuick.Controls 1.3; StackView { }") - << QByteArray("import QtQuick.Controls 2.0; StackView { }"); + << QByteArray("import Qt.labs.controls 1.0; StackView { }"); QTest::newRow("Switch") << QByteArray("import QtQuick.Controls 1.3; Switch { }") - << QByteArray("import QtQuick.Controls 2.0; Switch { }"); + << QByteArray("import Qt.labs.controls 1.0; Switch { }"); QTest::newRow("TabBar") << QByteArray() - << QByteArray("import QtQuick.Controls 2.0; TabBar { }"); + << QByteArray("import Qt.labs.controls 1.0; TabBar { }"); QTest::newRow("TabButton") << QByteArray() - << QByteArray("import QtQuick.Controls 2.0; TabButton { }"); + << QByteArray("import Qt.labs.controls 1.0; TabButton { }"); QTest::newRow("TextArea") << QByteArray("import QtQuick.Controls 1.3; TextArea { }") - << QByteArray("import QtQuick.Controls 2.0; TextArea { }"); + << QByteArray("import Qt.labs.controls 1.0; TextArea { }"); QTest::newRow("TextField") << QByteArray("import QtQuick.Controls 1.3; TextField { }") - << QByteArray("import QtQuick.Controls 2.0; TextField { }"); + << QByteArray("import Qt.labs.controls 1.0; TextField { }"); QTest::newRow("ToolBar") << QByteArray("import QtQuick.Controls 1.3; ToolBar { }") - << QByteArray("import QtQuick.Controls 2.0; ToolBar { }"); + << QByteArray("import Qt.labs.controls 1.0; ToolBar { }"); QTest::newRow("ToolButton") << QByteArray("import QtQuick.Controls 1.3; ToolButton { }") - << QByteArray("import QtQuick.Controls 2.0; ToolButton { }"); + << QByteArray("import Qt.labs.controls 1.0; ToolButton { }"); } QTEST_MAIN(tst_ObjectCount) diff --git a/tests/manual/fonts/main.qml b/tests/manual/fonts/main.qml index 1654e93c..e429cbfd 100644 --- a/tests/manual/fonts/main.qml +++ b/tests/manual/fonts/main.qml @@ -39,7 +39,7 @@ ****************************************************************************/ import QtQuick 2.6 -import QtQuick.Controls 2.0 +import Qt.labs.controls 1.0 import Qt.labs.templates 1.0 as T import QtQuick.Layouts 1.2 diff --git a/tests/manual/gifs/data/qtlabscontrols-busyindicator.qml b/tests/manual/gifs/data/qtlabscontrols-busyindicator.qml new file mode 100644 index 00000000..8b6940cc --- /dev/null +++ b/tests/manual/gifs/data/qtlabscontrols-busyindicator.qml @@ -0,0 +1,55 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.controls 1.0 + +Item { + width: busyIndicator.implicitWidth + height: busyIndicator.implicitHeight + + property alias busyIndicator: busyIndicator + + BusyIndicator { + id: busyIndicator + running: false + anchors.centerIn: parent + } +} diff --git a/tests/manual/gifs/data/qtlabscontrols-button.qml b/tests/manual/gifs/data/qtlabscontrols-button.qml new file mode 100644 index 00000000..c536d1e1 --- /dev/null +++ b/tests/manual/gifs/data/qtlabscontrols-button.qml @@ -0,0 +1,47 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.controls 1.0 + +Button { + text: pressed ? "Pressed" : "Normal" + width: 80 +} diff --git a/tests/manual/gifs/data/qtlabscontrols-slider.qml b/tests/manual/gifs/data/qtlabscontrols-slider.qml new file mode 100644 index 00000000..82cd3ad9 --- /dev/null +++ b/tests/manual/gifs/data/qtlabscontrols-slider.qml @@ -0,0 +1,52 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.controls 1.0 + +Item { + width: slider.implicitWidth + height: slider.implicitHeight + + Slider { + id: slider + anchors.centerIn: parent + } +} diff --git a/tests/manual/gifs/data/qtlabscontrols-switch.qml b/tests/manual/gifs/data/qtlabscontrols-switch.qml new file mode 100644 index 00000000..01818ba8 --- /dev/null +++ b/tests/manual/gifs/data/qtlabscontrols-switch.qml @@ -0,0 +1,45 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.controls 1.0 + +Switch { +} diff --git a/tests/manual/gifs/data/qtlabscontrols-tabbar.qml b/tests/manual/gifs/data/qtlabscontrols-tabbar.qml new file mode 100644 index 00000000..c7a8653f --- /dev/null +++ b/tests/manual/gifs/data/qtlabscontrols-tabbar.qml @@ -0,0 +1,56 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.controls 1.0 + +Item { + width: 200 + height: tabBar.height + + TabBar { + id: tabBar + width: parent.width + + TabButton { text: qsTr("Home") } + TabButton { text: qsTr("Discover") } + TabButton { text: qsTr("Activity") } + } +} diff --git a/tests/manual/gifs/data/qtlabscontrols-tumbler-wrap.qml b/tests/manual/gifs/data/qtlabscontrols-tumbler-wrap.qml new file mode 100644 index 00000000..8576f09b --- /dev/null +++ b/tests/manual/gifs/data/qtlabscontrols-tumbler-wrap.qml @@ -0,0 +1,119 @@ +/**************************************************************************** +** +** Copyright (C) 2015 The Qt Company Ltd. +** Contact: http://www.qt.io/licensing/ +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:BSD$ +** You may use this file under the terms of the BSD license as follows: +** +** "Redistribution and use in source and binary forms, with or without +** modification, are permitted provided that the following conditions are +** met: +** * Redistributions of source code must retain the above copyright +** notice, this list of conditions and the following disclaimer. +** * Redistributions in binary form must reproduce the above copyright +** notice, this list of conditions and the following disclaimer in +** the documentation and/or other materials provided with the +** distribution. +** * Neither the name of The Qt Company Ltd nor the names of its +** contributors may be used to endorse or promote products derived +** from this software without specific prior written permission. +** +** +** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR +** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT +** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, +** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT +** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, +** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY +** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.6 +import Qt.labs.controls 1.0 +import Qt.labs.templates 1.0 as T + +Item { + width: 200 + height: 200 + + Frame { + padding: 0 + anchors.centerIn: parent + width: row.implicitWidth + height: row.implicitHeight + + FontMetrics { + id: fontMetrics + } + + Component { + id: delegateComponent + + Text { + text: modelData.toString().length < 2 ? "0" + modelData : modelData + color: "#666666" + opacity: 0.4 + Math.max(0, 1 - Math.abs(T.Tumbler.displacement)) * 0.6 + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + font.pixelSize: fontMetrics.font.pixelSize * 1.25 + } + } + + Row { + id: row + + Tumbler { + id: hoursTumbler + model: 12 + delegate: Text { + text: (modelData.toString().length < 2 ? "0" : "") + (modelData + 1) + color: "#666666" + opacity: 0.4 + Math.max(0, 1 - Math.abs(T.Tumbler.displacement)) * 0.6 + horizontalAlignment: Text.AlignHCenter + verticalAlignment: Text.AlignVCenter + font.pixelSize: fontMetrics.font.pixelSize * 1.25 + } + width: 50 + height: 150 + } + + Tumbler { + id: minutesTumbler + currentIndex: 6 + model: 60 + delegate: delegateComponent + width: 50 + height: 150 + } + + Tumbler { + id: amPmTumbler + model: ["AM", "PM"] + delegate: delegateComponent + width: 50 + height: 150 + contentItem: ListView { + anchors.fill: parent + model: amPmTumbler.model + delegate: amPmTumbler.delegate + + snapMode: ListView.SnapToItem + highlightRangeMode: ListView.StrictlyEnforceRange + preferredHighlightBegin: height / 2 - (height / 3 / 2) + preferredHighlightEnd: height / 2 + (height / 3 / 2) + clip: true + } + } + } + } +} diff --git a/tests/manual/gifs/data/qtquickcontrols2-busyindicator.qml b/tests/manual/gifs/data/qtquickcontrols2-busyindicator.qml deleted file mode 100644 index ad659ade..00000000 --- a/tests/manual/gifs/data/qtquickcontrols2-busyindicator.qml +++ /dev/null @@ -1,55 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.6 -import QtQuick.Controls 2.0 - -Item { - width: busyIndicator.implicitWidth - height: busyIndicator.implicitHeight - - property alias busyIndicator: busyIndicator - - BusyIndicator { - id: busyIndicator - running: false - anchors.centerIn: parent - } -} diff --git a/tests/manual/gifs/data/qtquickcontrols2-button.qml b/tests/manual/gifs/data/qtquickcontrols2-button.qml deleted file mode 100644 index 46ef9bc5..00000000 --- a/tests/manual/gifs/data/qtquickcontrols2-button.qml +++ /dev/null @@ -1,47 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.6 -import QtQuick.Controls 2.0 - -Button { - text: pressed ? "Pressed" : "Normal" - width: 80 -} diff --git a/tests/manual/gifs/data/qtquickcontrols2-slider.qml b/tests/manual/gifs/data/qtquickcontrols2-slider.qml deleted file mode 100644 index 0a26df86..00000000 --- a/tests/manual/gifs/data/qtquickcontrols2-slider.qml +++ /dev/null @@ -1,52 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.6 -import QtQuick.Controls 2.0 - -Item { - width: slider.implicitWidth - height: slider.implicitHeight - - Slider { - id: slider - anchors.centerIn: parent - } -} diff --git a/tests/manual/gifs/data/qtquickcontrols2-switch.qml b/tests/manual/gifs/data/qtquickcontrols2-switch.qml deleted file mode 100644 index f1c6daab..00000000 --- a/tests/manual/gifs/data/qtquickcontrols2-switch.qml +++ /dev/null @@ -1,45 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.6 -import QtQuick.Controls 2.0 - -Switch { -} diff --git a/tests/manual/gifs/data/qtquickcontrols2-tabbar.qml b/tests/manual/gifs/data/qtquickcontrols2-tabbar.qml deleted file mode 100644 index 9f5bd797..00000000 --- a/tests/manual/gifs/data/qtquickcontrols2-tabbar.qml +++ /dev/null @@ -1,56 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.6 -import QtQuick.Controls 2.0 - -Item { - width: 200 - height: tabBar.height - - TabBar { - id: tabBar - width: parent.width - - TabButton { text: qsTr("Home") } - TabButton { text: qsTr("Discover") } - TabButton { text: qsTr("Activity") } - } -} diff --git a/tests/manual/gifs/data/qtquickcontrols2-tumbler-wrap.qml b/tests/manual/gifs/data/qtquickcontrols2-tumbler-wrap.qml deleted file mode 100644 index 985c64c4..00000000 --- a/tests/manual/gifs/data/qtquickcontrols2-tumbler-wrap.qml +++ /dev/null @@ -1,119 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2015 The Qt Company Ltd. -** Contact: http://www.qt.io/licensing/ -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:BSD$ -** You may use this file under the terms of the BSD license as follows: -** -** "Redistribution and use in source and binary forms, with or without -** modification, are permitted provided that the following conditions are -** met: -** * Redistributions of source code must retain the above copyright -** notice, this list of conditions and the following disclaimer. -** * Redistributions in binary form must reproduce the above copyright -** notice, this list of conditions and the following disclaimer in -** the documentation and/or other materials provided with the -** distribution. -** * Neither the name of The Qt Company Ltd nor the names of its -** contributors may be used to endorse or promote products derived -** from this software without specific prior written permission. -** -** -** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - -import QtQuick 2.6 -import QtQuick.Controls 2.0 -import Qt.labs.templates 1.0 as T - -Item { - width: 200 - height: 200 - - Frame { - padding: 0 - anchors.centerIn: parent - width: row.implicitWidth - height: row.implicitHeight - - FontMetrics { - id: fontMetrics - } - - Component { - id: delegateComponent - - Text { - text: modelData.toString().length < 2 ? "0" + modelData : modelData - color: "#666666" - opacity: 0.4 + Math.max(0, 1 - Math.abs(T.Tumbler.displacement)) * 0.6 - horizontalAlignment: Text.AlignHCenter - verticalAlignment: Text.AlignVCenter - font.pixelSize: fontMetrics.font.pixelSize * 1.25 - } - } - - Row { - id: row - - Tumbler { - id: hoursTumbler - model: 12 - delegate: Text { - text: (modelData.toString().length < 2 ? "0" : "") + (modelData + 1) - color: "#666666" - opacity: 0.4 + Math.max(0, 1 - Math.abs(T.Tumbler.displacement)) * 0.6 - horizontalAlignment: Text.AlignHCenter - verticalAlignment: Text.AlignVCenter - font.pixelSize: fontMetrics.font.pixelSize * 1.25 - } - width: 50 - height: 150 - } - - Tumbler { - id: minutesTumbler - currentIndex: 6 - model: 60 - delegate: delegateComponent - width: 50 - height: 150 - } - - Tumbler { - id: amPmTumbler - model: ["AM", "PM"] - delegate: delegateComponent - width: 50 - height: 150 - contentItem: ListView { - anchors.fill: parent - model: amPmTumbler.model - delegate: amPmTumbler.delegate - - snapMode: ListView.SnapToItem - highlightRangeMode: ListView.StrictlyEnforceRange - preferredHighlightBegin: height / 2 - (height / 3 / 2) - preferredHighlightEnd: height / 2 + (height / 3 / 2) - clip: true - } - } - } - } -} diff --git a/tests/manual/gifs/gifrecorder.cpp b/tests/manual/gifs/gifrecorder.cpp index 8d1b6a8c..302dbec3 100644 --- a/tests/manual/gifs/gifrecorder.cpp +++ b/tests/manual/gifs/gifrecorder.cpp @@ -232,7 +232,7 @@ void GifRecorder::waitForFinish() if (mHighQuality) { // Indicate the end of recording and the beginning of conversion. QQmlComponent busyComponent(mView->engine()); - busyComponent.setData("import QtQuick 2.6; import QtQuick.Controls 2.0; Rectangle { anchors.fill: parent; " \ + busyComponent.setData("import QtQuick 2.6; import Qt.labs.controls 1.0; Rectangle { anchors.fill: parent; " \ "BusyIndicator { width: 32; height: 32; anchors.centerIn: parent } }", QUrl()); QCOMPARE(busyComponent.status(), QQmlComponent::Ready); QQuickItem *busyRect = qobject_cast(busyComponent.create()); diff --git a/tests/manual/gifs/tst_gifs.cpp b/tests/manual/gifs/tst_gifs.cpp index a74fa894..df636cd2 100644 --- a/tests/manual/gifs/tst_gifs.cpp +++ b/tests/manual/gifs/tst_gifs.cpp @@ -81,7 +81,7 @@ void tst_Gifs::tumblerWrap() gifRecorder.setDataDirPath(dataDirPath); gifRecorder.setOutputDir(outputDir); gifRecorder.setRecordingDuration(4); - gifRecorder.setQmlFileName("qtquickcontrols2-tumbler-wrap.qml"); + gifRecorder.setQmlFileName("qtlabscontrols-tumbler-wrap.qml"); gifRecorder.setView(&view); view.show(); @@ -154,7 +154,7 @@ void tst_Gifs::slider() gifRecorder.setOutputDir(outputDir); gifRecorder.setRecordingDuration(4); gifRecorder.setHighQuality(true); - gifRecorder.setQmlFileName("qtquickcontrols2-slider.qml"); + gifRecorder.setQmlFileName("qtlabscontrols-slider.qml"); gifRecorder.setView(&view); view.show(); @@ -273,7 +273,7 @@ void tst_Gifs::busyIndicator() gifRecorder.setOutputDir(outputDir); gifRecorder.setRecordingDuration(3); gifRecorder.setHighQuality(true); - gifRecorder.setQmlFileName("qtquickcontrols2-busyindicator.qml"); + gifRecorder.setQmlFileName("qtlabscontrols-busyindicator.qml"); gifRecorder.setView(&view); view.show(); @@ -302,7 +302,7 @@ void tst_Gifs::switchGif() gifRecorder.setDataDirPath(dataDirPath); gifRecorder.setOutputDir(outputDir); gifRecorder.setRecordingDuration(3); - gifRecorder.setQmlFileName("qtquickcontrols2-switch.qml"); + gifRecorder.setQmlFileName("qtlabscontrols-switch.qml"); gifRecorder.setHighQuality(true); gifRecorder.setView(&view); @@ -322,7 +322,7 @@ void tst_Gifs::button() gifRecorder.setDataDirPath(dataDirPath); gifRecorder.setOutputDir(outputDir); gifRecorder.setRecordingDuration(3); - gifRecorder.setQmlFileName("qtquickcontrols2-button.qml"); + gifRecorder.setQmlFileName("qtlabscontrols-button.qml"); gifRecorder.setHighQuality(true); gifRecorder.setView(&view); @@ -338,7 +338,7 @@ void tst_Gifs::button() void tst_Gifs::tabBar() { - const QString qmlFileName = QStringLiteral("qtquickcontrols2-tabbar.qml"); + const QString qmlFileName = QStringLiteral("qtlabscontrols-tabbar.qml"); GifRecorder gifRecorder; gifRecorder.setDataDirPath(dataDirPath); -- cgit v1.2.3