aboutsummaryrefslogtreecommitdiffstats
path: root/src/imports/controls
diff options
context:
space:
mode:
Diffstat (limited to 'src/imports/controls')
-rw-r--r--src/imports/controls/SpinBox.qml9
-rw-r--r--src/imports/controls/designer/qtquickcontrols2.metainfo46
-rw-r--r--src/imports/controls/doc/images/qtlabscalendar-calendarmodel.pngbin6057 -> 5724 bytes
-rw-r--r--src/imports/controls/doc/images/qtlabscalendar-dayofweekrow-layout.pngbin9176 -> 7455 bytes
-rw-r--r--src/imports/controls/doc/images/qtlabscalendar-dayofweekrow.pngbin2513 -> 2017 bytes
-rw-r--r--src/imports/controls/doc/images/qtlabscalendar-monthgrid-layout.pngbin10913 -> 8876 bytes
-rw-r--r--src/imports/controls/doc/images/qtlabscalendar-monthgrid.pngbin6503 -> 3827 bytes
-rw-r--r--src/imports/controls/doc/images/qtlabscalendar-weeknumbercolumn-layout.pngbin8333 -> 4986 bytes
-rw-r--r--src/imports/controls/doc/images/qtlabscalendar-weeknumbercolumn.pngbin1977 -> 1453 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-busyindicator-background.pngbin1594 -> 0 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-busyindicator-contentItem.pngbin1583 -> 0 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-busyindicator-custom.pngbin1213 -> 1502 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-button-background.pngbin1499 -> 0 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-button-contentItem.pngbin1550 -> 0 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-button-custom.pngbin1512 -> 1294 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-button-disabled.pngbin1653 -> 1569 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-button-focused.pngbin1515 -> 1482 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-button-normal.pngbin1507 -> 1257 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-button-pressed.pngbin1949 -> 1196 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-checkbox-background.pngbin2607 -> 0 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-checkbox-checked.pngbin2687 -> 1905 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-checkbox-contentItem.pngbin2582 -> 0 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-checkbox-custom.pngbin2719 -> 2268 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-checkbox-disabled.pngbin2197 -> 1529 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-checkbox-focused.pngbin2069 -> 1628 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-checkbox-indicator.pngbin2539 -> 0 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-checkbox-normal.pngbin1547 -> 1339 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-checkdelegate-background.pngbin3203 -> 0 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-checkdelegate-contentItem.pngbin3091 -> 0 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-checkdelegate-custom.pngbin3850 -> 2619 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-checkdelegate-indicator.pngbin3104 -> 0 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-combobox-background.pngbin2731 -> 0 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-combobox-contentItem.pngbin2752 -> 0 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-combobox-custom.pngbin1231 -> 1169 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-combobox-delegate.pngbin4999 -> 1343 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-combobox-popup.pngbin4969 -> 1343 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-customize-buttons.pngbin4133 -> 3224 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-default.pngbin19608 -> 16855 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-dial-background.pngbin6563 -> 0 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-dial-custom.pngbin6275 -> 6274 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-dial-handle.pngbin7325 -> 5703 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-frame-background.pngbin345 -> 0 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-frame-custom.pngbin4071 -> 2261 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-frame.pngbin5213 -> 3824 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-groupbox-background.pngbin2685 -> 0 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-groupbox-checkable.pngbin8311 -> 6388 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-groupbox-custom.pngbin6307 -> 3885 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-groupbox-label.pngbin2673 -> 2052 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-groupbox.pngbin7718 -> 5682 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-itemdelegate-background.pngbin2019 -> 0 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-itemdelegate-contentItem.pngbin2022 -> 0 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-itemdelegate-custom.pngbin2802 -> 1812 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-itemdelegate-indicator.pngbin3456 -> 0 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-itemdelegate.pngbin9440 -> 7029 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-label-background.pngbin1118 -> 0 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-label-custom.pngbin1121 -> 963 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-label.pngbin1093 -> 946 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-material.pngbin23669 -> 29049 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-menu-contentItem.pngbin4777 -> 0 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-menu-custom.pngbin4613 -> 2960 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-pageindicator-background.pngbin415 -> 0 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-pageindicator-contentItem.pngbin348 -> 0 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-pane-background.pngbin341 -> 0 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-pane-custom.pngbin3970 -> 2244 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-pane.pngbin4939 -> 3561 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-popup-settings.pngbin0 -> 12440 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-progressbar-background.pngbin146 -> 0 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-progressbar-contentItem.pngbin133 -> 0 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-progressbar-custom.pngbin226 -> 226 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-radiobutton-background.pngbin3474 -> 0 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-radiobutton-checked.pngbin3411 -> 2591 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-radiobutton-contentItem.pngbin3435 -> 0 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-radiobutton-custom.pngbin3720 -> 2868 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-radiobutton-disabled.pngbin2897 -> 2179 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-radiobutton-focused.pngbin2771 -> 2328 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-radiobutton-indicator.pngbin3337 -> 0 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-radiobutton-normal.pngbin2234 -> 2027 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-radiodelegate-background.pngbin3727 -> 0 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-radiodelegate-contentItem.pngbin3595 -> 0 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-radiodelegate-custom.pngbin4273 -> 3135 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-radiodelegate-indicator.pngbin3595 -> 0 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-rangeslider-background.pngbin1201 -> 0 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-rangeslider-custom.pngbin1097 -> 1077 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-rangeslider-disabled.pngbin1204 -> 1106 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-rangeslider-first-handle-focused.pngbin1204 -> 1266 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-rangeslider-first-handle.pngbin1206 -> 1230 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-rangeslider-normal.pngbin1204 -> 1266 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-rangeslider-second-handle-focused.pngbin1204 -> 1266 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-rangeslider-second-handle.pngbin1365 -> 1385 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-scrollbar-background.pngbin260 -> 0 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-scrollbar-contentItem.pngbin248 -> 0 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-scrollbar-custom.pngbin233 -> 236 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-scrollindicator-background.pngbin147 -> 0 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-scrollindicator-contentItem.pngbin121 -> 0 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-slider-background.pngbin1104 -> 0 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-slider-custom.pngbin954 -> 954 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-slider-disabled.pngbin1117 -> 1019 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-slider-focused.pngbin1117 -> 1154 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-slider-handle.pngbin953 -> 967 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-slider-normal.pngbin1117 -> 1154 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-spinbox-background.pngbin1104 -> 0 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-spinbox-contentItem.pngbin1178 -> 0 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-spinbox-custom.pngbin1073 -> 1175 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-spinbox-double.pngbin1129 -> 933 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-spinbox-down.pngbin1130 -> 984 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-spinbox-textual.pngbin1825 -> 1505 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-spinbox-up.pngbin1144 -> 995 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-spinbox.pngbin1149 -> 989 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-swipedelegate-background.pngbin1919 -> 0 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-swipedelegate-contentItem.pngbin1894 -> 0 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-swipedelegate-custom.pngbin3266 -> 2434 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-swipedelegate-indicator.pngbin2407 -> 0 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-switch-background.pngbin2648 -> 0 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-switch-checked.pngbin3124 -> 2427 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-switch-contentItem.pngbin2605 -> 0 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-switch-custom.pngbin2648 -> 2251 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-switch-disabled.pngbin3218 -> 2633 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-switch-focused.pngbin2905 -> 2532 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-switch-indicator.pngbin2522 -> 0 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-switch-normal.pngbin2415 -> 2249 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-switchdelegate-background.pngbin3630 -> 0 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-switchdelegate-contentItem.pngbin3477 -> 0 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-switchdelegate-custom.pngbin4581 -> 3567 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-switchdelegate-indicator.pngbin3493 -> 0 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-tabbar-custom.pngbin4697 -> 3568 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-tabbar.pngbin4725 -> 3882 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-tabbutton.pngbin4728 -> 3597 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-textarea-custom.pngbin2847 -> 1974 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-textfield-background.pngbin1976 -> 0 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-textfield-custom.pngbin3704 -> 2387 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-textfield-disabled.pngbin193 -> 1282 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-textfield-focused.pngbin2072 -> 1633 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-textfield-normal.pngbin1553 -> 1325 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-togglebutton-background.pngbin2558 -> 0 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-togglebutton-checked.pngbin1921 -> 0 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-togglebutton-disabled.pngbin1921 -> 0 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-togglebutton-focused.pngbin1788 -> 0 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-togglebutton-indicator.pngbin2450 -> 0 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-togglebutton-label.pngbin2530 -> 0 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-togglebutton-normal.pngbin1444 -> 0 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-toolbar-background.pngbin217 -> 0 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-toolbar-custom.pngbin1806 -> 1531 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-toolbar.pngbin4172 -> 3358 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-toolbutton-background.pngbin1722 -> 0 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-toolbutton-contentItem.pngbin1682 -> 0 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-toolbutton-custom.pngbin1725 -> 1419 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-tooltip-background.pngbin1014 -> 0 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-tooltip-contentItem.pngbin1046 -> 0 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-tooltip-hover.pngbin1275 -> 1205 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-tooltip-pressandhold.pngbin1275 -> 1205 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-tooltip-slider.pngbin2130 -> 2057 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-tooltip.pngbin5611 -> 1483 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-tumbler-background.pngbin1289 -> 0 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-tumbler-contentItem.pngbin1289 -> 0 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-tumbler-custom.pngbin2791 -> 2282 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-tumbler-delegate.pngbin1300 -> 1176 bytes
-rw-r--r--src/imports/controls/doc/images/qtquickcontrols2-universal.pngbin18382 -> 25572 bytes
-rw-r--r--src/imports/controls/doc/qtquickcontrols2.qdocconf13
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-busyindicator-background.qml36
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-busyindicator-contentItem.qml37
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-button-background.qml39
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-button-contentItem.qml39
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-background.qml37
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-contentItem.qml38
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-indicator.qml38
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-background.qml38
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-contentItem.qml39
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-indicator.qml39
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-combobox-background.qml38
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-combobox-contentItem.qml38
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-dial-background.qml37
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-frame-background.qml38
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-background.qml39
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-background.qml37
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-contentItem.qml38
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-indicator.qml38
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-label-background.qml37
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-menu-contentItem.qml58
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-background.qml38
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-contentItem.qml39
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-pane-background.qml38
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-background.qml38
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-contentItem.qml39
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-background.qml37
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-contentItem.qml38
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-indicator.qml38
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-background.qml38
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-contentItem.qml39
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-indicator.qml39
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-background.qml38
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-background.qml40
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-contentItem.qml42
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-background.qml40
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-contentItem.qml42
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-slider-background.qml38
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-background.qml38
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-contentItem.qml38
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-custom.qml4
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-background.qml38
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-contentItem.qml38
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-custom.qml6
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-indicator.qml39
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-switch-background.qml37
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-switch-contentItem.qml38
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-switch-indicator.qml38
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-background.qml38
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-contentItem.qml39
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-indicator.qml39
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-textfield-background.qml39
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-toolbar-background.qml39
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-toolbutton-background.qml38
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-toolbutton-contentItem.qml38
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-background.qml49
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-contentItem.qml49
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-background.qml39
-rw-r--r--src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-contentItem.qml39
-rw-r--r--src/imports/controls/doc/src/includes/qquickswitch.qdocinc4
-rw-r--r--src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc2
-rw-r--r--src/imports/controls/doc/src/qtquickcontrols2-default.qdoc2
-rw-r--r--src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc124
-rw-r--r--src/imports/controls/doc/src/qtquickcontrols2-material.qdoc28
-rw-r--r--src/imports/controls/doc/src/qtquickcontrols2-popups.qdoc35
-rw-r--r--src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc47
-rw-r--r--src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc28
-rw-r--r--src/imports/controls/material/CheckIndicator.qml26
-rw-r--r--src/imports/controls/material/ElevationEffect.qml2
-rw-r--r--src/imports/controls/material/SpinBox.qml6
-rw-r--r--src/imports/controls/material/qquickmaterialstyle.cpp17
-rw-r--r--src/imports/controls/material/qquickmaterialstyle_p.h2
-rw-r--r--src/imports/controls/plugins.qmltypes1855
-rw-r--r--src/imports/controls/universal/SpinBox.qml8
231 files changed, 2172 insertions, 2281 deletions
diff --git a/src/imports/controls/SpinBox.qml b/src/imports/controls/SpinBox.qml
index 93db1c8e..89853116 100644
--- a/src/imports/controls/SpinBox.qml
+++ b/src/imports/controls/SpinBox.qml
@@ -53,7 +53,6 @@ T.SpinBox {
padding: 6
leftPadding: padding + (control.mirrored ? (up.indicator ? up.indicator.width : 0) : (down.indicator ? down.indicator.width : 0))
rightPadding: padding + (control.mirrored ? (down.indicator ? down.indicator.width : 0) : (up.indicator ? up.indicator.width : 0))
- opacity: control.enabled ? 1 : 0.3
//! [validator]
validator: IntValidator {
@@ -67,6 +66,7 @@ T.SpinBox {
contentItem: TextInput {
z: 2
text: control.textFromValue(control.value, control.locale)
+ opacity: control.enabled ? 1 : 0.3
font: control.font
color: "#353637"
@@ -105,14 +105,14 @@ T.SpinBox {
y: (parent.height - height) / 2
width: parent.width / 3
height: 2
- color: control.enabled ? "#353637" : "#bdbebf"
+ color: enabled ? "#353637" : "#bdbebf"
}
Rectangle {
x: (parent.width - width) / 2
y: (parent.height - height) / 2
width: 2
height: parent.width / 3
- color: control.enabled ? "#353637" : "#bdbebf"
+ color: enabled ? "#353637" : "#bdbebf"
}
}
//! [up.indicator]
@@ -130,13 +130,14 @@ T.SpinBox {
y: (parent.height - height) / 2
width: parent.width / 3
height: 2
- color: control.enabled ? "#353637" : "#bdbebf"
+ color: enabled ? "#353637" : "#bdbebf"
}
}
//! [down.indicator]
//! [background]
background: Rectangle {
+ opacity: control.enabled ? 1 : 0.3
implicitWidth: 140
border.color: "#e0e0e0"
}
diff --git a/src/imports/controls/designer/qtquickcontrols2.metainfo b/src/imports/controls/designer/qtquickcontrols2.metainfo
index f802b714..4c876cf5 100644
--- a/src/imports/controls/designer/qtquickcontrols2.metainfo
+++ b/src/imports/controls/designer/qtquickcontrols2.metainfo
@@ -1,6 +1,6 @@
MetaInfo {
Type {
- name: "Qt.Quick.Controls.BusyIndicator"
+ name: "QtQuick.Controls.BusyIndicator"
icon: "images/busyindicator-icon16.png"
ItemLibraryEntry {
@@ -13,7 +13,7 @@ MetaInfo {
}
Type {
- name: "Qt.Quick.Controls.Button"
+ name: "QtQuick.Controls.Button"
icon: "images/button-icon16.png"
ItemLibraryEntry {
@@ -28,7 +28,7 @@ MetaInfo {
}
Type {
- name: "Qt.Quick.Controls.CheckBox"
+ name: "QtQuick.Controls.CheckBox"
icon: "images/checkbox-icon16.png"
ItemLibraryEntry {
@@ -43,7 +43,7 @@ MetaInfo {
}
Type {
- name: "Qt.Quick.Controls.CheckDelegate"
+ name: "QtQuick.Controls.CheckDelegate"
icon: "images/checkbox-icon16.png"
ItemLibraryEntry {
@@ -58,7 +58,7 @@ MetaInfo {
}
Type {
- name: "Qt.Quick.Controls.ComboBox"
+ name: "QtQuick.Controls.ComboBox"
icon: "images/combobox-icon16.png"
ItemLibraryEntry {
@@ -71,7 +71,7 @@ MetaInfo {
}
Type {
- name: "Qt.Quick.Controls.Dial"
+ name: "QtQuick.Controls.Dial"
icon: "images/dial-icon16.png"
ItemLibraryEntry {
@@ -84,7 +84,7 @@ MetaInfo {
}
Type {
- name: "Qt.Quick.Controls.Frame"
+ name: "QtQuick.Controls.Frame"
icon: "images/frame-icon16.png"
ItemLibraryEntry {
@@ -100,7 +100,7 @@ MetaInfo {
}
Type {
- name: "Qt.Quick.Controls.GroupBox"
+ name: "QtQuick.Controls.GroupBox"
icon: "images/groupbox-icon16.png"
ItemLibraryEntry {
@@ -117,7 +117,7 @@ MetaInfo {
}
Type {
- name: "Qt.Quick.Controls.ItemDelegate"
+ name: "QtQuick.Controls.ItemDelegate"
icon: "images/itemdelegate-icon16.png"
ItemLibraryEntry {
@@ -132,7 +132,7 @@ MetaInfo {
}
Type {
- name: "Qt.Quick.Controls.Label"
+ name: "QtQuick.Controls.Label"
icon: "images/label-icon16.png"
ItemLibraryEntry {
@@ -147,7 +147,7 @@ MetaInfo {
}
Type {
- name: "Qt.Quick.Controls.PageIndicator"
+ name: "QtQuick.Controls.PageIndicator"
icon: "images/pageindicator-icon16.png"
ItemLibraryEntry {
@@ -162,7 +162,7 @@ MetaInfo {
}
Type {
- name: "Qt.Quick.Controls.Pane"
+ name: "QtQuick.Controls.Pane"
icon: "images/pane-icon16.png"
ItemLibraryEntry {
@@ -178,7 +178,7 @@ MetaInfo {
}
Type {
- name: "Qt.Quick.Controls.ProgressBar"
+ name: "QtQuick.Controls.ProgressBar"
icon: "images/progressbar-icon16.png"
ItemLibraryEntry {
@@ -193,7 +193,7 @@ MetaInfo {
}
Type {
- name: "Qt.Quick.Controls.RadioButton"
+ name: "QtQuick.Controls.RadioButton"
icon: "images/radiobutton-icon16.png"
ItemLibraryEntry {
@@ -208,7 +208,7 @@ MetaInfo {
}
Type {
- name: "Qt.Quick.Controls.RadioDelegate"
+ name: "QtQuick.Controls.RadioDelegate"
icon: "images/radiobutton-icon16.png"
ItemLibraryEntry {
@@ -223,7 +223,7 @@ MetaInfo {
}
Type {
- name: "Qt.Quick.Controls.Slider"
+ name: "QtQuick.Controls.Slider"
icon: "images/slider-icon16.png"
ItemLibraryEntry {
@@ -238,7 +238,7 @@ MetaInfo {
}
Type {
- name: "Qt.Quick.Controls.SpinBox"
+ name: "QtQuick.Controls.SpinBox"
icon: "images/spinbox-icon16.png"
ItemLibraryEntry {
@@ -251,7 +251,7 @@ MetaInfo {
}
Type {
- name: "Qt.Quick.Controls.Switch"
+ name: "QtQuick.Controls.Switch"
icon: "images/switch-icon16.png"
ItemLibraryEntry {
@@ -266,7 +266,7 @@ MetaInfo {
}
Type {
- name: "Qt.Quick.Controls.TextArea"
+ name: "QtQuick.Controls.TextArea"
icon: "images/textarea-icon16.png"
ItemLibraryEntry {
@@ -281,7 +281,7 @@ MetaInfo {
}
Type {
- name: "Qt.Quick.Controls.TextField"
+ name: "QtQuick.Controls.TextField"
icon: "images/textfield-icon16.png"
ItemLibraryEntry {
@@ -296,7 +296,7 @@ MetaInfo {
}
Type {
- name: "Qt.Quick.Controls.ToolButton"
+ name: "QtQuick.Controls.ToolButton"
icon: "images/toolbutton-icon16.png"
ItemLibraryEntry {
@@ -311,7 +311,7 @@ MetaInfo {
}
Type {
- name: "Qt.Quick.Controls.ToolBar"
+ name: "QtQuick.Controls.ToolBar"
icon: "images/toolbar-icon16.png"
ItemLibraryEntry {
@@ -326,7 +326,7 @@ MetaInfo {
}
Type {
- name: "Qt.Quick.Controls.Tumbler"
+ name: "QtQuick.Controls.Tumbler"
icon: "images/tumbler-icon16.png"
ItemLibraryEntry {
diff --git a/src/imports/controls/doc/images/qtlabscalendar-calendarmodel.png b/src/imports/controls/doc/images/qtlabscalendar-calendarmodel.png
index 2bdff335..7a140d27 100644
--- a/src/imports/controls/doc/images/qtlabscalendar-calendarmodel.png
+++ b/src/imports/controls/doc/images/qtlabscalendar-calendarmodel.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtlabscalendar-dayofweekrow-layout.png b/src/imports/controls/doc/images/qtlabscalendar-dayofweekrow-layout.png
index e0d7ca33..130e3757 100644
--- a/src/imports/controls/doc/images/qtlabscalendar-dayofweekrow-layout.png
+++ b/src/imports/controls/doc/images/qtlabscalendar-dayofweekrow-layout.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtlabscalendar-dayofweekrow.png b/src/imports/controls/doc/images/qtlabscalendar-dayofweekrow.png
index 7b955c88..6c8424ab 100644
--- a/src/imports/controls/doc/images/qtlabscalendar-dayofweekrow.png
+++ b/src/imports/controls/doc/images/qtlabscalendar-dayofweekrow.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtlabscalendar-monthgrid-layout.png b/src/imports/controls/doc/images/qtlabscalendar-monthgrid-layout.png
index ae5db0c1..dd903650 100644
--- a/src/imports/controls/doc/images/qtlabscalendar-monthgrid-layout.png
+++ b/src/imports/controls/doc/images/qtlabscalendar-monthgrid-layout.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtlabscalendar-monthgrid.png b/src/imports/controls/doc/images/qtlabscalendar-monthgrid.png
index 13495d05..0c3b3c41 100644
--- a/src/imports/controls/doc/images/qtlabscalendar-monthgrid.png
+++ b/src/imports/controls/doc/images/qtlabscalendar-monthgrid.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtlabscalendar-weeknumbercolumn-layout.png b/src/imports/controls/doc/images/qtlabscalendar-weeknumbercolumn-layout.png
index 09deb30e..b015a3e6 100644
--- a/src/imports/controls/doc/images/qtlabscalendar-weeknumbercolumn-layout.png
+++ b/src/imports/controls/doc/images/qtlabscalendar-weeknumbercolumn-layout.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtlabscalendar-weeknumbercolumn.png b/src/imports/controls/doc/images/qtlabscalendar-weeknumbercolumn.png
index db0b94f3..65e25b29 100644
--- a/src/imports/controls/doc/images/qtlabscalendar-weeknumbercolumn.png
+++ b/src/imports/controls/doc/images/qtlabscalendar-weeknumbercolumn.png
Binary files 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 03cf98d0..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-busyindicator-background.png
+++ /dev/null
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-busyindicator-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-busyindicator-contentItem.png
deleted file mode 100644
index fb14cb86..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-busyindicator-contentItem.png
+++ /dev/null
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-busyindicator-custom.png b/src/imports/controls/doc/images/qtquickcontrols2-busyindicator-custom.png
index 8bae4909..89a38660 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-busyindicator-custom.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-busyindicator-custom.png
Binary files 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 c2703157..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-button-background.png
+++ /dev/null
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-button-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-button-contentItem.png
deleted file mode 100644
index 73d8f2fb..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-button-contentItem.png
+++ /dev/null
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-button-custom.png b/src/imports/controls/doc/images/qtquickcontrols2-button-custom.png
index e418da04..5e68ed44 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-button-custom.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-button-custom.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-button-disabled.png b/src/imports/controls/doc/images/qtquickcontrols2-button-disabled.png
index 33638d1e..3375152c 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-button-disabled.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-button-disabled.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-button-focused.png b/src/imports/controls/doc/images/qtquickcontrols2-button-focused.png
index 24d2cd06..a487bd27 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-button-focused.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-button-focused.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-button-normal.png b/src/imports/controls/doc/images/qtquickcontrols2-button-normal.png
index 9a5ea80e..7e7e281b 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-button-normal.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-button-normal.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-button-pressed.png b/src/imports/controls/doc/images/qtquickcontrols2-button-pressed.png
index c88d57b0..2dff7764 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-button-pressed.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-button-pressed.png
Binary files 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 4d24fa2f..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-background.png
+++ /dev/null
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-checked.png b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-checked.png
index 8620b0c2..71cb90ca 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-checked.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-checked.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-contentItem.png
deleted file mode 100644
index d5a1ef2e..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-contentItem.png
+++ /dev/null
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-custom.png b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-custom.png
index 03a3d0a5..922e458a 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-custom.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-custom.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-disabled.png b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-disabled.png
index 63669b29..0c4d3bf7 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-disabled.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-disabled.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-focused.png b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-focused.png
index ea49c721..5fb6daaf 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-focused.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-focused.png
Binary files 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 fe6cd7a2..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-indicator.png
+++ /dev/null
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-normal.png b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-normal.png
index b185fc99..69700ee0 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-checkbox-normal.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-checkbox-normal.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-checkdelegate-background.png b/src/imports/controls/doc/images/qtquickcontrols2-checkdelegate-background.png
deleted file mode 100644
index 79023922..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-checkdelegate-background.png
+++ /dev/null
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-checkdelegate-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-checkdelegate-contentItem.png
deleted file mode 100644
index 29d900a8..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-checkdelegate-contentItem.png
+++ /dev/null
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-checkdelegate-custom.png b/src/imports/controls/doc/images/qtquickcontrols2-checkdelegate-custom.png
index 2503c5c6..f565e0e7 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-checkdelegate-custom.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-checkdelegate-custom.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-checkdelegate-indicator.png b/src/imports/controls/doc/images/qtquickcontrols2-checkdelegate-indicator.png
deleted file mode 100644
index e1708413..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-checkdelegate-indicator.png
+++ /dev/null
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-combobox-background.png b/src/imports/controls/doc/images/qtquickcontrols2-combobox-background.png
deleted file mode 100644
index 1930034b..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-combobox-background.png
+++ /dev/null
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-combobox-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-combobox-contentItem.png
deleted file mode 100644
index 08c7bfc8..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-combobox-contentItem.png
+++ /dev/null
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-combobox-custom.png b/src/imports/controls/doc/images/qtquickcontrols2-combobox-custom.png
index badf1b52..0b2e34bf 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-combobox-custom.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-combobox-custom.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-combobox-delegate.png b/src/imports/controls/doc/images/qtquickcontrols2-combobox-delegate.png
index d76776cf..7e716b3d 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-combobox-delegate.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-combobox-delegate.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-combobox-popup.png b/src/imports/controls/doc/images/qtquickcontrols2-combobox-popup.png
index 5cb32247..7e716b3d 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-combobox-popup.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-combobox-popup.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-customize-buttons.png b/src/imports/controls/doc/images/qtquickcontrols2-customize-buttons.png
index 7132b876..f4e2454e 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-customize-buttons.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-customize-buttons.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-default.png b/src/imports/controls/doc/images/qtquickcontrols2-default.png
index 144ceacb..67e52b84 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-default.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-default.png
Binary files 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 ca6c9283..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-dial-background.png
+++ /dev/null
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-dial-custom.png b/src/imports/controls/doc/images/qtquickcontrols2-dial-custom.png
index 98643b9f..dc5779c0 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-dial-custom.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-dial-custom.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-dial-handle.png b/src/imports/controls/doc/images/qtquickcontrols2-dial-handle.png
index b9a8e0d8..49ba9d0c 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-dial-handle.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-dial-handle.png
Binary files 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 75ad77bd..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-frame-background.png
+++ /dev/null
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-frame-custom.png b/src/imports/controls/doc/images/qtquickcontrols2-frame-custom.png
index 94f491fc..c9d00187 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-frame-custom.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-frame-custom.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-frame.png b/src/imports/controls/doc/images/qtquickcontrols2-frame.png
index dc14acaf..3bc1a76a 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-frame.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-frame.png
Binary files 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 baec44d5..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-groupbox-background.png
+++ /dev/null
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-groupbox-checkable.png b/src/imports/controls/doc/images/qtquickcontrols2-groupbox-checkable.png
index 9b3f32b1..fd36aec2 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-groupbox-checkable.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-groupbox-checkable.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-groupbox-custom.png b/src/imports/controls/doc/images/qtquickcontrols2-groupbox-custom.png
index 7759cf38..29f0a60d 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-groupbox-custom.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-groupbox-custom.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-groupbox-label.png b/src/imports/controls/doc/images/qtquickcontrols2-groupbox-label.png
index ea4dfb32..4929be52 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-groupbox-label.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-groupbox-label.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-groupbox.png b/src/imports/controls/doc/images/qtquickcontrols2-groupbox.png
index c0fc92c7..ef57cc64 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-groupbox.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-groupbox.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-itemdelegate-background.png b/src/imports/controls/doc/images/qtquickcontrols2-itemdelegate-background.png
deleted file mode 100644
index 99b87780..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-itemdelegate-background.png
+++ /dev/null
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-itemdelegate-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-itemdelegate-contentItem.png
deleted file mode 100644
index 9f924cd3..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-itemdelegate-contentItem.png
+++ /dev/null
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-itemdelegate-custom.png b/src/imports/controls/doc/images/qtquickcontrols2-itemdelegate-custom.png
index 9e3fa0c1..ff8ba047 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-itemdelegate-custom.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-itemdelegate-custom.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-itemdelegate-indicator.png b/src/imports/controls/doc/images/qtquickcontrols2-itemdelegate-indicator.png
deleted file mode 100644
index 029abb00..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-itemdelegate-indicator.png
+++ /dev/null
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-itemdelegate.png b/src/imports/controls/doc/images/qtquickcontrols2-itemdelegate.png
index 456a0d55..bbf49fad 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-itemdelegate.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-itemdelegate.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-label-background.png b/src/imports/controls/doc/images/qtquickcontrols2-label-background.png
deleted file mode 100644
index 34a638d6..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-label-background.png
+++ /dev/null
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-label-custom.png b/src/imports/controls/doc/images/qtquickcontrols2-label-custom.png
index 563c74b1..5d950fe6 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-label-custom.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-label-custom.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-label.png b/src/imports/controls/doc/images/qtquickcontrols2-label.png
index 961ce3e3..a51912f5 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-label.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-label.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-material.png b/src/imports/controls/doc/images/qtquickcontrols2-material.png
index d7ce0e88..4caef89e 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-material.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-material.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-menu-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-menu-contentItem.png
deleted file mode 100644
index 4dcf1fac..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-menu-contentItem.png
+++ /dev/null
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-menu-custom.png b/src/imports/controls/doc/images/qtquickcontrols2-menu-custom.png
index 8b8c6cc6..7121fd0a 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-menu-custom.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-menu-custom.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-pageindicator-background.png b/src/imports/controls/doc/images/qtquickcontrols2-pageindicator-background.png
deleted file mode 100644
index 756b87f1..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-pageindicator-background.png
+++ /dev/null
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-pageindicator-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-pageindicator-contentItem.png
deleted file mode 100644
index cfce4ffb..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-pageindicator-contentItem.png
+++ /dev/null
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-pane-background.png b/src/imports/controls/doc/images/qtquickcontrols2-pane-background.png
deleted file mode 100644
index a379d915..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-pane-background.png
+++ /dev/null
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-pane-custom.png b/src/imports/controls/doc/images/qtquickcontrols2-pane-custom.png
index 6b429379..4c24f426 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-pane-custom.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-pane-custom.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-pane.png b/src/imports/controls/doc/images/qtquickcontrols2-pane.png
index fe534424..b34e9488 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-pane.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-pane.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-popup-settings.png b/src/imports/controls/doc/images/qtquickcontrols2-popup-settings.png
new file mode 100644
index 00000000..787de5d4
--- /dev/null
+++ b/src/imports/controls/doc/images/qtquickcontrols2-popup-settings.png
Binary files 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 59e81b2b..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-progressbar-background.png
+++ /dev/null
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-progressbar-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-progressbar-contentItem.png
deleted file mode 100644
index 9ce19e92..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-progressbar-contentItem.png
+++ /dev/null
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-progressbar-custom.png b/src/imports/controls/doc/images/qtquickcontrols2-progressbar-custom.png
index bb461b65..c018e5e7 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-progressbar-custom.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-progressbar-custom.png
Binary files 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 30295394..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-background.png
+++ /dev/null
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-checked.png b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-checked.png
index 8f5af513..d22a595b 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-checked.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-checked.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-contentItem.png
deleted file mode 100644
index 457555b7..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-contentItem.png
+++ /dev/null
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-custom.png b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-custom.png
index 85262f9c..15835a3c 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-custom.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-custom.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-disabled.png b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-disabled.png
index 626cd616..11a99d6f 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-disabled.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-disabled.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-focused.png b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-focused.png
index 797e50a9..d7c79ed1 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-focused.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-focused.png
Binary files 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 0d78a0d5..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-indicator.png
+++ /dev/null
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-normal.png b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-normal.png
index f8d0828b..8a49bf58 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-normal.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-radiobutton-normal.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-radiodelegate-background.png b/src/imports/controls/doc/images/qtquickcontrols2-radiodelegate-background.png
deleted file mode 100644
index f9ff48c2..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-radiodelegate-background.png
+++ /dev/null
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-radiodelegate-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-radiodelegate-contentItem.png
deleted file mode 100644
index 9ede889f..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-radiodelegate-contentItem.png
+++ /dev/null
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-radiodelegate-custom.png b/src/imports/controls/doc/images/qtquickcontrols2-radiodelegate-custom.png
index be6a9d08..46245323 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-radiodelegate-custom.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-radiodelegate-custom.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-radiodelegate-indicator.png b/src/imports/controls/doc/images/qtquickcontrols2-radiodelegate-indicator.png
deleted file mode 100644
index 9d8cbdbd..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-radiodelegate-indicator.png
+++ /dev/null
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-background.png b/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-background.png
deleted file mode 100644
index c045fdbb..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-background.png
+++ /dev/null
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-custom.png b/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-custom.png
index d481b4e9..8508a73d 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-custom.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-custom.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-disabled.png b/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-disabled.png
index abb033c2..8406fca6 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-disabled.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-disabled.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-first-handle-focused.png b/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-first-handle-focused.png
index abb033c2..c5f658d5 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-first-handle-focused.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-first-handle-focused.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-first-handle.png b/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-first-handle.png
index fb246db3..535362bf 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-first-handle.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-first-handle.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-normal.png b/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-normal.png
index abb033c2..c5f658d5 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-normal.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-normal.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-second-handle-focused.png b/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-second-handle-focused.png
index abb033c2..c5f658d5 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-second-handle-focused.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-second-handle-focused.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-second-handle.png b/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-second-handle.png
index a33a6de2..44509959 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-second-handle.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-rangeslider-second-handle.png
Binary files 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 0b1aa171..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-scrollbar-background.png
+++ /dev/null
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-scrollbar-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-scrollbar-contentItem.png
deleted file mode 100644
index 5d916e66..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-scrollbar-contentItem.png
+++ /dev/null
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-scrollbar-custom.png b/src/imports/controls/doc/images/qtquickcontrols2-scrollbar-custom.png
index 2e582a70..f986f674 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-scrollbar-custom.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-scrollbar-custom.png
Binary files 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 e9fa04c7..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-scrollindicator-background.png
+++ /dev/null
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-scrollindicator-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-scrollindicator-contentItem.png
deleted file mode 100644
index 99266362..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-scrollindicator-contentItem.png
+++ /dev/null
Binary files 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 23a754c3..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-slider-background.png
+++ /dev/null
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-slider-custom.png b/src/imports/controls/doc/images/qtquickcontrols2-slider-custom.png
index 2323b79f..fc4c89d5 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-slider-custom.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-slider-custom.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-slider-disabled.png b/src/imports/controls/doc/images/qtquickcontrols2-slider-disabled.png
index 2e27a604..919a9a2b 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-slider-disabled.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-slider-disabled.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-slider-focused.png b/src/imports/controls/doc/images/qtquickcontrols2-slider-focused.png
index 2e27a604..e6c4179c 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-slider-focused.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-slider-focused.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-slider-handle.png b/src/imports/controls/doc/images/qtquickcontrols2-slider-handle.png
index 7729ef07..093f4a96 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-slider-handle.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-slider-handle.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-slider-normal.png b/src/imports/controls/doc/images/qtquickcontrols2-slider-normal.png
index 2e27a604..e6c4179c 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-slider-normal.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-slider-normal.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-spinbox-background.png b/src/imports/controls/doc/images/qtquickcontrols2-spinbox-background.png
deleted file mode 100644
index 74fbab6e..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-spinbox-background.png
+++ /dev/null
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-spinbox-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-spinbox-contentItem.png
deleted file mode 100644
index 81d549c0..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-spinbox-contentItem.png
+++ /dev/null
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-spinbox-custom.png b/src/imports/controls/doc/images/qtquickcontrols2-spinbox-custom.png
index 64acb6f9..5aeee0c4 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-spinbox-custom.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-spinbox-custom.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-spinbox-double.png b/src/imports/controls/doc/images/qtquickcontrols2-spinbox-double.png
index fcfaa472..cdece17b 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-spinbox-double.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-spinbox-double.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-spinbox-down.png b/src/imports/controls/doc/images/qtquickcontrols2-spinbox-down.png
index e7c43101..1f88f98d 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-spinbox-down.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-spinbox-down.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-spinbox-textual.png b/src/imports/controls/doc/images/qtquickcontrols2-spinbox-textual.png
index 4361c492..922e59b7 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-spinbox-textual.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-spinbox-textual.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-spinbox-up.png b/src/imports/controls/doc/images/qtquickcontrols2-spinbox-up.png
index b9992471..7d254971 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-spinbox-up.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-spinbox-up.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-spinbox.png b/src/imports/controls/doc/images/qtquickcontrols2-spinbox.png
index 909fbda6..6aa341bb 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-spinbox.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-spinbox.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-swipedelegate-background.png b/src/imports/controls/doc/images/qtquickcontrols2-swipedelegate-background.png
deleted file mode 100644
index 07f388bb..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-swipedelegate-background.png
+++ /dev/null
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-swipedelegate-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-swipedelegate-contentItem.png
deleted file mode 100644
index cec6cf15..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-swipedelegate-contentItem.png
+++ /dev/null
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-swipedelegate-custom.png b/src/imports/controls/doc/images/qtquickcontrols2-swipedelegate-custom.png
index 25ae9e77..10c60ac3 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-swipedelegate-custom.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-swipedelegate-custom.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-swipedelegate-indicator.png b/src/imports/controls/doc/images/qtquickcontrols2-swipedelegate-indicator.png
deleted file mode 100644
index 1b43928b..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-swipedelegate-indicator.png
+++ /dev/null
Binary files 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 c3cf20f3..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-switch-background.png
+++ /dev/null
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-switch-checked.png b/src/imports/controls/doc/images/qtquickcontrols2-switch-checked.png
index 7c678417..f4b0320c 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-switch-checked.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-switch-checked.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-switch-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-switch-contentItem.png
deleted file mode 100644
index 50f608ab..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-switch-contentItem.png
+++ /dev/null
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-switch-custom.png b/src/imports/controls/doc/images/qtquickcontrols2-switch-custom.png
index 5293a8b9..737d3a09 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-switch-custom.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-switch-custom.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-switch-disabled.png b/src/imports/controls/doc/images/qtquickcontrols2-switch-disabled.png
index 15ff76e6..060d2b2a 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-switch-disabled.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-switch-disabled.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-switch-focused.png b/src/imports/controls/doc/images/qtquickcontrols2-switch-focused.png
index 9e973d0e..2384f76a 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-switch-focused.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-switch-focused.png
Binary files 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 02b88dde..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-switch-indicator.png
+++ /dev/null
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-switch-normal.png b/src/imports/controls/doc/images/qtquickcontrols2-switch-normal.png
index aac440a0..5f84f62a 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-switch-normal.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-switch-normal.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-switchdelegate-background.png b/src/imports/controls/doc/images/qtquickcontrols2-switchdelegate-background.png
deleted file mode 100644
index e53141ac..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-switchdelegate-background.png
+++ /dev/null
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-switchdelegate-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-switchdelegate-contentItem.png
deleted file mode 100644
index e12be69a..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-switchdelegate-contentItem.png
+++ /dev/null
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-switchdelegate-custom.png b/src/imports/controls/doc/images/qtquickcontrols2-switchdelegate-custom.png
index d7f5430b..3a77a480 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-switchdelegate-custom.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-switchdelegate-custom.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-switchdelegate-indicator.png b/src/imports/controls/doc/images/qtquickcontrols2-switchdelegate-indicator.png
deleted file mode 100644
index 33c15cdf..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-switchdelegate-indicator.png
+++ /dev/null
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-tabbar-custom.png b/src/imports/controls/doc/images/qtquickcontrols2-tabbar-custom.png
index 3203e619..cadf3079 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-tabbar-custom.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-tabbar-custom.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-tabbar.png b/src/imports/controls/doc/images/qtquickcontrols2-tabbar.png
index 44a91d63..6993c8bd 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-tabbar.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-tabbar.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-tabbutton.png b/src/imports/controls/doc/images/qtquickcontrols2-tabbutton.png
index 76d1e35c..3cdce15e 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-tabbutton.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-tabbutton.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-textarea-custom.png b/src/imports/controls/doc/images/qtquickcontrols2-textarea-custom.png
index 7ed0c2cf..59777574 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-textarea-custom.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-textarea-custom.png
Binary files 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 e345124d..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-textfield-background.png
+++ /dev/null
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-textfield-custom.png b/src/imports/controls/doc/images/qtquickcontrols2-textfield-custom.png
index acca494f..a9f40c07 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-textfield-custom.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-textfield-custom.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-textfield-disabled.png b/src/imports/controls/doc/images/qtquickcontrols2-textfield-disabled.png
index 55034be2..a027c72a 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-textfield-disabled.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-textfield-disabled.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-textfield-focused.png b/src/imports/controls/doc/images/qtquickcontrols2-textfield-focused.png
index bf5ee32a..a63d3c85 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-textfield-focused.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-textfield-focused.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-textfield-normal.png b/src/imports/controls/doc/images/qtquickcontrols2-textfield-normal.png
index 02bb465a..25047227 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-textfield-normal.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-textfield-normal.png
Binary files 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
--- a/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-background.png
+++ /dev/null
Binary files 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
--- a/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-checked.png
+++ /dev/null
Binary files 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
--- a/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-disabled.png
+++ /dev/null
Binary files 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
--- a/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-focused.png
+++ /dev/null
Binary files 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
--- a/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-indicator.png
+++ /dev/null
Binary files 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
--- a/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-label.png
+++ /dev/null
Binary files 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
--- a/src/imports/controls/doc/images/qtquickcontrols2-togglebutton-normal.png
+++ /dev/null
Binary files 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 12b4c348..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-toolbar-background.png
+++ /dev/null
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-toolbar-custom.png b/src/imports/controls/doc/images/qtquickcontrols2-toolbar-custom.png
index 9e07ce57..374cc836 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-toolbar-custom.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-toolbar-custom.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-toolbar.png b/src/imports/controls/doc/images/qtquickcontrols2-toolbar.png
index 3e64b4e4..f4808ca9 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-toolbar.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-toolbar.png
Binary files 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 8dd64031..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-toolbutton-background.png
+++ /dev/null
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-toolbutton-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-toolbutton-contentItem.png
deleted file mode 100644
index f4797098..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-toolbutton-contentItem.png
+++ /dev/null
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-toolbutton-custom.png b/src/imports/controls/doc/images/qtquickcontrols2-toolbutton-custom.png
index f590af7d..4bd209aa 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-toolbutton-custom.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-toolbutton-custom.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-tooltip-background.png b/src/imports/controls/doc/images/qtquickcontrols2-tooltip-background.png
deleted file mode 100644
index c082c840..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-tooltip-background.png
+++ /dev/null
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-tooltip-contentItem.png b/src/imports/controls/doc/images/qtquickcontrols2-tooltip-contentItem.png
deleted file mode 100644
index d79a336f..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-tooltip-contentItem.png
+++ /dev/null
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-tooltip-hover.png b/src/imports/controls/doc/images/qtquickcontrols2-tooltip-hover.png
index b5c70d86..64a79839 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-tooltip-hover.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-tooltip-hover.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-tooltip-pressandhold.png b/src/imports/controls/doc/images/qtquickcontrols2-tooltip-pressandhold.png
index b5c70d86..64a79839 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-tooltip-pressandhold.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-tooltip-pressandhold.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-tooltip-slider.png b/src/imports/controls/doc/images/qtquickcontrols2-tooltip-slider.png
index 6dad4464..440f6eba 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-tooltip-slider.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-tooltip-slider.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-tooltip.png b/src/imports/controls/doc/images/qtquickcontrols2-tooltip.png
index ffac3ed6..0a4d57e5 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-tooltip.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-tooltip.png
Binary files 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 24c200de..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-tumbler-background.png
+++ /dev/null
Binary files 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 24c200de..00000000
--- a/src/imports/controls/doc/images/qtquickcontrols2-tumbler-contentItem.png
+++ /dev/null
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-tumbler-custom.png b/src/imports/controls/doc/images/qtquickcontrols2-tumbler-custom.png
index 39a2c509..0ebb9edf 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-tumbler-custom.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-tumbler-custom.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-tumbler-delegate.png b/src/imports/controls/doc/images/qtquickcontrols2-tumbler-delegate.png
index d274d444..5213bcd8 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-tumbler-delegate.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-tumbler-delegate.png
Binary files differ
diff --git a/src/imports/controls/doc/images/qtquickcontrols2-universal.png b/src/imports/controls/doc/images/qtquickcontrols2-universal.png
index 89a0f069..b50d9cca 100644
--- a/src/imports/controls/doc/images/qtquickcontrols2-universal.png
+++ b/src/imports/controls/doc/images/qtquickcontrols2-universal.png
Binary files differ
diff --git a/src/imports/controls/doc/qtquickcontrols2.qdocconf b/src/imports/controls/doc/qtquickcontrols2.qdocconf
index 25eb8e9c..563fb771 100644
--- a/src/imports/controls/doc/qtquickcontrols2.qdocconf
+++ b/src/imports/controls/doc/qtquickcontrols2.qdocconf
@@ -29,7 +29,7 @@ qhp.QtQuickControls2.subprojects.examples.title = Examples
qhp.QtQuickControls2.subprojects.examples.indexTitle = Qt Quick Controls 2 Examples
qhp.QtQuickControls2.subprojects.examples.selectors = fake:example
-depends = qtcore qtgui qtdoc qtqml qtquick qtquickdialogs qtquickcontrols qmake qtsql qtwidgets
+depends = qtcore qtgui qtdoc qtqml qtquick qtquickdialogs qtquickcontrols qtquickextras qmake qtsql qtwidgets
# Specify the install path under QT_INSTALL_EXAMPLES
# Note: paths passed to \example command must contain the parent directory, e.g.
@@ -61,7 +61,7 @@ navigation.cppclassespage = "Qt Quick Controls 2 C++ Classes"
tagfile = qtquickcontrols2.tags
# \styleimport {QtQuick.Controls.Universal 2.0}
-macro.styleimport.HTML = "<table class=\"alignedsummary\"><tbody><tr><td class=\"memItemLeft rightAlign topAlign\"> Import Statement:</td><td class=\"memItemRight bottomAlign\"> import \1</td></tr></tbody></table>"
+macro.styleimport.HTML = "<table class=\"alignedsummary\"><tbody><tr><td class=\"memItemLeft rightAlign topAlign\"> Import Statement:</td><td class=\"memItemRight bottomAlign\"> import \1</td></tr><tr><td class=\"memItemLeft rightAlign topAlign\"> Since:</td><td class=\"memItemRight bottomAlign\"> \2</td></tr></tbody></table>"
# \styleproperty {Universal.accent} {enumeration} {html-target-id}
# \target html-target-id
@@ -71,9 +71,18 @@ macro.styleimport.HTML = "<table class=\"alignedsummary\"><tbody><tr><td class=\
macro.styleproperty.HTML = "<div class=\"qmlproto\"><table class=\"qmlname\"><tbody><tr valign=\"top\" class=\"odd\" id=\"\3\"><td class=\"tblQmlPropNode\"><p><span class=\"name\">\1</span> : <span class=\"type\">\2</span></p></td></tr></tbody></table></div>"
macro.endstyleproperty = "\\br"
+# \stylemethod {returntype} {methodname} {argtype} {argname} {html-target-id}
+# \target html-target-id
+# This property holds ...
+# (empty line)
+# \endstylemethod
+macro.stylemethod.HTML = "<div class=\"qmlproto\"><table class=\"qmlname\"><tbody><tr valign=\"top\" class=\"odd\" id=\"\5\"><td class=\"tblQmlFuncNode\"><p><span class=\"type\">\1</span> <span class=\"name\">\2</span>(<span class="type">\3</span> <i>\4</i>)</p></td></tr></tbody></table></div>"
+macro.endstylemethod = "\\br"
+
# \stylecolor {#6A00FF} {(default)}
macro.stylecolor.HTML = "<div style=\"padding:10px;color:#fff;background:\1;\">\1 \2</div>"
+macro.nbsp.HTML = "&nbsp;"
macro.labs = "\\note \\e{Types in the Qt.labs module are not guaranteed to remain compatible in future versions.}"
#Add output suffix to the html filenames
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-busyindicator-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-busyindicator-background.qml
deleted file mode 100644
index b003cd82..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-busyindicator-background.qml
+++ /dev/null
@@ -1,36 +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$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-BusyIndicator {
- background: Rectangle {
- color: 'transparent'
- border.color: 'red'
- }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-busyindicator-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-busyindicator-contentItem.qml
deleted file mode 100644
index 87a8a0fe..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-busyindicator-contentItem.qml
+++ /dev/null
@@ -1,37 +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$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-BusyIndicator {
- Rectangle {
- anchors.fill: contentItem
- color: 'transparent'
- border.color: 'red'
- }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-button-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-button-background.qml
deleted file mode 100644
index 4c179384..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-button-background.qml
+++ /dev/null
@@ -1,39 +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$
-**
-****************************************************************************/
-
-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/src/imports/controls/doc/snippets/qtquickcontrols2-button-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-button-contentItem.qml
deleted file mode 100644
index 482eee54..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-button-contentItem.qml
+++ /dev/null
@@ -1,39 +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$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-Button {
- width: 80
- text: "Button"
- Rectangle {
- anchors.fill: contentItem
- color: 'transparent'
- border.color: 'red'
- }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-background.qml
deleted file mode 100644
index c53604b9..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-background.qml
+++ /dev/null
@@ -1,37 +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$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-CheckBox {
- text: "CheckBox"
- background: Rectangle {
- color: "transparent"
- border.color: "red"
- }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-contentItem.qml
deleted file mode 100644
index 282cfb59..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-contentItem.qml
+++ /dev/null
@@ -1,38 +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$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-CheckBox {
- text: "CheckBox"
- Rectangle {
- anchors.fill: contentItem
- color: "transparent"
- border.color: "red"
- }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-indicator.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-indicator.qml
deleted file mode 100644
index 041871f1..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-checkbox-indicator.qml
+++ /dev/null
@@ -1,38 +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$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-CheckBox {
- text: "CheckBox"
- Rectangle {
- anchors.fill: indicator
- color: "transparent"
- border.color: "red"
- }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-background.qml
deleted file mode 100644
index ab868506..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-background.qml
+++ /dev/null
@@ -1,38 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 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$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-CheckDelegate {
- text: "CheckDelegate"
- checked: true
- background: Rectangle {
- color: 'transparent'
- border.color: 'red'
- }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-contentItem.qml
deleted file mode 100644
index 377fa39f..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-contentItem.qml
+++ /dev/null
@@ -1,39 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 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$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-CheckDelegate {
- text: "CheckDelegate"
- checked: true
- Rectangle {
- anchors.fill: contentItem
- color: "transparent"
- border.color: "red"
- }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-indicator.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-indicator.qml
deleted file mode 100644
index 0af46fbe..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-checkdelegate-indicator.qml
+++ /dev/null
@@ -1,39 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 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$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-CheckDelegate {
- text: "CheckDelegate"
- checked: true
- Rectangle {
- anchors.fill: indicator
- color: "transparent"
- border.color: "red"
- }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-background.qml
deleted file mode 100644
index a61cf18d..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-background.qml
+++ /dev/null
@@ -1,38 +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$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-ComboBox {
- model: ["ComboBox"]
- Rectangle {
- anchors.fill: background
- color: 'transparent'
- border.color: 'red'
- }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-contentItem.qml
deleted file mode 100644
index cd3383c7..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-contentItem.qml
+++ /dev/null
@@ -1,38 +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$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-ComboBox {
- model: ["ComboBox"]
- Rectangle {
- anchors.fill: contentItem
- color: 'transparent'
- border.color: 'red'
- }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-dial-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-dial-background.qml
deleted file mode 100644
index 46187995..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-dial-background.qml
+++ /dev/null
@@ -1,37 +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$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-Dial {
- Rectangle {
- anchors.fill: background
- color: 'transparent'
- border.color: 'red'
- }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-frame-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-frame-background.qml
deleted file mode 100644
index 90537ddd..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-frame-background.qml
+++ /dev/null
@@ -1,38 +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$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-Frame {
- width: 100
- height: 100
- background: Rectangle {
- color: 'transparent'
- border.color: 'red'
- }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-background.qml
deleted file mode 100644
index c379a7ce..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-groupbox-background.qml
+++ /dev/null
@@ -1,39 +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$
-**
-****************************************************************************/
-
-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/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-background.qml
deleted file mode 100644
index 81148ebd..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-background.qml
+++ /dev/null
@@ -1,37 +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$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-ItemDelegate {
- text: "ItemDelegate"
- background: Rectangle {
- color: 'transparent'
- border.color: 'red'
- }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-contentItem.qml
deleted file mode 100644
index 76082088..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-contentItem.qml
+++ /dev/null
@@ -1,38 +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$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-ItemDelegate {
- text: "ItemDelegate"
- Rectangle {
- anchors.fill: contentItem
- color: "transparent"
- border.color: "red"
- }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-indicator.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-indicator.qml
deleted file mode 100644
index 9a293d3c..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-itemdelegate-indicator.qml
+++ /dev/null
@@ -1,38 +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$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-ItemDelegate {
- text: "ItemDelegate"
- Rectangle {
- anchors.fill: indicator
- color: "transparent"
- border.color: "red"
- }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-label-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-label-background.qml
deleted file mode 100644
index b08f2ff5..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-label-background.qml
+++ /dev/null
@@ -1,37 +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$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-Label {
- text: "Label"
- background: Rectangle {
- color: 'transparent'
- border.color: 'red'
- }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-menu-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-menu-contentItem.qml
deleted file mode 100644
index ffbaa934..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-menu-contentItem.qml
+++ /dev/null
@@ -1,58 +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$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-Item {
- id: window
- width: menu.contentItem.width
- height: menu.contentItem.height
- visible: true
-
- Menu {
- id: menu
- contentItem.parent: window
-
- MenuItem {
- text: "New..."
- }
- MenuItem {
- text: "Open..."
- }
- MenuItem {
- text: "Save"
- }
- }
-
- Rectangle {
- parent: menu.contentItem
- anchors.fill: parent
- color: 'transparent'
- border.color: 'red'
- }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-background.qml
deleted file mode 100644
index a6a4a9e3..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-background.qml
+++ /dev/null
@@ -1,38 +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$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-PageIndicator {
- count: 5
- currentIndex: 2
- background: Rectangle {
- color: 'transparent'
- border.color: 'red'
- }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-contentItem.qml
deleted file mode 100644
index 039a0507..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-pageindicator-contentItem.qml
+++ /dev/null
@@ -1,39 +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$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-PageIndicator {
- count: 5
- currentIndex: 2
- Rectangle {
- anchors.fill: contentItem
- color: 'transparent'
- border.color: 'red'
- }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-pane-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-pane-background.qml
deleted file mode 100644
index 40a07495..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-pane-background.qml
+++ /dev/null
@@ -1,38 +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$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-Pane {
- width: 100
- height: 100
- background: Rectangle {
- color: 'transparent'
- border.color: 'red'
- }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-background.qml
deleted file mode 100644
index 2a5ddc4e..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-background.qml
+++ /dev/null
@@ -1,38 +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$
-**
-****************************************************************************/
-
-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/src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-contentItem.qml
deleted file mode 100644
index 068eff76..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-progressbar-contentItem.qml
+++ /dev/null
@@ -1,39 +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$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-ProgressBar {
- value: 0.5
- Rectangle {
- parent: contentItem
- anchors.fill: parent
- color: "transparent"
- border.color: "red"
- }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-background.qml
deleted file mode 100644
index 21f22e6f..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-background.qml
+++ /dev/null
@@ -1,37 +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$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-RadioButton {
- text: "RadioButton"
- background: Rectangle {
- color: "transparent"
- border.color: "red"
- }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-contentItem.qml
deleted file mode 100644
index 1d54af6b..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-contentItem.qml
+++ /dev/null
@@ -1,38 +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$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-RadioButton {
- text: "RadioButton"
- Rectangle {
- anchors.fill: contentItem
- color: "transparent"
- border.color: "red"
- }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-indicator.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-indicator.qml
deleted file mode 100644
index b138c25d..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-radiobutton-indicator.qml
+++ /dev/null
@@ -1,38 +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$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-RadioButton {
- text: "RadioButton"
- Rectangle {
- anchors.fill: indicator
- color: "transparent"
- border.color: "red"
- }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-background.qml
deleted file mode 100644
index 99123371..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-background.qml
+++ /dev/null
@@ -1,38 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 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$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-RadioDelegate {
- text: "RadioDelegate"
- checked: true
- background: Rectangle {
- color: 'transparent'
- border.color: 'red'
- }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-contentItem.qml
deleted file mode 100644
index b14a2f13..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-contentItem.qml
+++ /dev/null
@@ -1,39 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 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$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-RadioDelegate {
- text: "RadioDelegate"
- checked: true
- Rectangle {
- anchors.fill: contentItem
- color: "transparent"
- border.color: "red"
- }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-indicator.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-indicator.qml
deleted file mode 100644
index d8b0e395..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-radiodelegate-indicator.qml
+++ /dev/null
@@ -1,39 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 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$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-RadioDelegate {
- text: "RadioDelegate"
- checked: true
- Rectangle {
- anchors.fill: indicator
- color: "transparent"
- border.color: "red"
- }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-background.qml
deleted file mode 100644
index a948f319..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-rangeslider-background.qml
+++ /dev/null
@@ -1,38 +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$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-RangeSlider {
- first.value: 0.25
- second.value: 0.75
- background: Rectangle {
- color: "transparent"
- border.color: "red"
- }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-background.qml
deleted file mode 100644
index eebb5157..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-background.qml
+++ /dev/null
@@ -1,40 +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$
-**
-****************************************************************************/
-
-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/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-contentItem.qml
deleted file mode 100644
index f039e291..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollbar-contentItem.qml
+++ /dev/null
@@ -1,42 +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$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-ScrollBar {
- size: 0.5
- position: 0.5
- active: true
- height: 100
- Rectangle {
- parent: contentItem
- anchors.fill: parent
- color: "transparent"
- border.color: "red"
- }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-background.qml
deleted file mode 100644
index 9e540cf9..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-background.qml
+++ /dev/null
@@ -1,40 +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$
-**
-****************************************************************************/
-
-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/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-contentItem.qml
deleted file mode 100644
index c32539be..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-scrollindicator-contentItem.qml
+++ /dev/null
@@ -1,42 +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$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-ScrollIndicator {
- size: 0.5
- position: 0.5
- active: true
- height: 100
- Rectangle {
- parent: contentItem
- anchors.fill: parent
- color: "transparent"
- border.color: "red"
- }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-slider-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-slider-background.qml
deleted file mode 100644
index 94f4a176..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-slider-background.qml
+++ /dev/null
@@ -1,38 +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$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-Slider {
- value: 0.5
- Rectangle {
- anchors.fill: background
- color: "transparent"
- border.color: "red"
- }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-background.qml
deleted file mode 100644
index 6cf47ac9..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-background.qml
+++ /dev/null
@@ -1,38 +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$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-SpinBox {
- value: 50
- Rectangle {
- anchors.fill: parent
- color: "transparent"
- border.color: "red"
- }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-contentItem.qml
deleted file mode 100644
index e226fc09..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-contentItem.qml
+++ /dev/null
@@ -1,38 +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$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-SpinBox {
- value: 50
- Rectangle {
- anchors.fill: contentItem
- color: "transparent"
- border.color: "red"
- }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-custom.qml
index 99549b8c..6433fd80 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-custom.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-spinbox-custom.qml
@@ -56,7 +56,7 @@ SpinBox {
implicitWidth: 40
implicitHeight: 40
color: up.pressed ? "#e4e4e4" : "#f6f6f6"
- border.color: control.enabled ? "#21be2b" : "#bdbebf"
+ border.color: enabled ? "#21be2b" : "#bdbebf"
Text {
text: "+"
@@ -75,7 +75,7 @@ SpinBox {
implicitWidth: 40
implicitHeight: 40
color: down.pressed ? "#e4e4e4" : "#f6f6f6"
- border.color: control.enabled ? "#21be2b" : "#bdbebf"
+ border.color: enabled ? "#21be2b" : "#bdbebf"
Text {
text: "-"
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-background.qml
deleted file mode 100644
index 4a37a13f..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-background.qml
+++ /dev/null
@@ -1,38 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 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$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-SwipeDelegate {
- text: "SwipeDelegate"
- Rectangle {
- anchors.fill: background
- color: "transparent"
- border.color: "red"
- }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-contentItem.qml
deleted file mode 100644
index 8284f7e4..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-contentItem.qml
+++ /dev/null
@@ -1,38 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 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$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-SwipeDelegate {
- text: "SwipeDelegate"
- Rectangle {
- anchors.fill: contentItem
- color: "transparent"
- border.color: "red"
- }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-custom.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-custom.qml
index bd58de8b..ae63efed 100644
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-custom.qml
+++ b/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-custom.qml
@@ -37,7 +37,7 @@ SwipeDelegate {
id: component
Rectangle {
- color: control.exposure.active && control.down ? "#333" : "#444"
+ color: control.swipe.complete && control.down ? "#333" : "#444"
width: parent.width
height: parent.height
clip: true
@@ -50,8 +50,8 @@ SwipeDelegate {
}
}
- exposure.left: component
- exposure.right: component
+ swipe.left: component
+ swipe.right: component
contentItem: Text {
text: control.text
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-indicator.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-indicator.qml
deleted file mode 100644
index 2a5be1a0..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-swipedelegate-indicator.qml
+++ /dev/null
@@ -1,39 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 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$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-SwipeDelegate {
- text: "SwipeDelegate"
- checked: true
- Rectangle {
- anchors.fill: indicator
- color: "transparent"
- border.color: "red"
- }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-switch-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-switch-background.qml
deleted file mode 100644
index 605df1f4..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-switch-background.qml
+++ /dev/null
@@ -1,37 +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$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-Switch {
- text: "Switch"
- background: Rectangle {
- color: "transparent"
- border.color: "red"
- }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-switch-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-switch-contentItem.qml
deleted file mode 100644
index 2e68086b..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-switch-contentItem.qml
+++ /dev/null
@@ -1,38 +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$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-Switch {
- text: "Switch"
- Rectangle {
- anchors.fill: contentItem
- color: "transparent"
- border.color: "red"
- }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-switch-indicator.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-switch-indicator.qml
deleted file mode 100644
index 7be24128..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-switch-indicator.qml
+++ /dev/null
@@ -1,38 +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$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-Switch {
- text: "Switch"
- Rectangle {
- anchors.fill: indicator
- color: "transparent"
- border.color: "red"
- }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-background.qml
deleted file mode 100644
index 27be5e86..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-background.qml
+++ /dev/null
@@ -1,38 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 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$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-SwitchDelegate {
- text: "SwitchDelegate"
- checked: true
- background: Rectangle {
- color: 'transparent'
- border.color: 'red'
- }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-contentItem.qml
deleted file mode 100644
index 121904cd..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-contentItem.qml
+++ /dev/null
@@ -1,39 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 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$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-SwitchDelegate {
- text: "SwitchDelegate"
- checked: true
- Rectangle {
- anchors.fill: contentItem
- color: "transparent"
- border.color: "red"
- }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-indicator.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-indicator.qml
deleted file mode 100644
index b3b1d121..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-switchdelegate-indicator.qml
+++ /dev/null
@@ -1,39 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 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$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-SwitchDelegate {
- text: "SwitchDelegate"
- checked: true
- Rectangle {
- anchors.fill: indicator
- color: "transparent"
- border.color: "red"
- }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-background.qml
deleted file mode 100644
index 8e012d19..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-textfield-background.qml
+++ /dev/null
@@ -1,39 +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$
-**
-****************************************************************************/
-
-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/src/imports/controls/doc/snippets/qtquickcontrols2-toolbar-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-toolbar-background.qml
deleted file mode 100644
index 6eed06bb..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-toolbar-background.qml
+++ /dev/null
@@ -1,39 +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$
-**
-****************************************************************************/
-
-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/src/imports/controls/doc/snippets/qtquickcontrols2-toolbutton-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-toolbutton-background.qml
deleted file mode 100644
index 619fac71..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-toolbutton-background.qml
+++ /dev/null
@@ -1,38 +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$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-ToolButton {
- text: "ToolButton"
- Rectangle {
- anchors.fill: background
- color: 'transparent'
- border.color: 'red'
- }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-toolbutton-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-toolbutton-contentItem.qml
deleted file mode 100644
index 6f78e45d..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-toolbutton-contentItem.qml
+++ /dev/null
@@ -1,38 +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$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-ToolButton {
- text: "ToolButton"
- Rectangle {
- anchors.fill: contentItem
- color: 'transparent'
- border.color: 'red'
- }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-background.qml
deleted file mode 100644
index 22444739..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-background.qml
+++ /dev/null
@@ -1,49 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 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$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Window 2.2
-import QtQuick.Controls 2.0
-
-Item {
- id: root
- width: tip.width
- height: tip.height
-
- ToolTip {
- id: tip
- text: "ToolTip"
- visible: root.Window.active
-
- Rectangle {
- parent: tip.background
- anchors.fill: parent
- color: 'transparent'
- border.color: 'red'
- }
- }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-contentItem.qml
deleted file mode 100644
index c05ee534..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-tooltip-contentItem.qml
+++ /dev/null
@@ -1,49 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2016 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$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Window 2.2
-import QtQuick.Controls 2.0
-
-Item {
- id: root
- width: tip.width
- height: tip.height
-
- ToolTip {
- id: tip
- text: "ToolTip"
- visible: root.Window.active
-
- Rectangle {
- parent: tip.contentItem
- anchors.fill: parent
- color: 'transparent'
- border.color: 'red'
- }
- }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-background.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-background.qml
deleted file mode 100644
index dcb2d942..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-background.qml
+++ /dev/null
@@ -1,39 +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$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import QtQuick.Controls 2.0
-
-Tumbler {
- model: 5
-
- Rectangle {
- anchors.fill: parent
- color: 'transparent'
- border.color: 'red'
- }
-}
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-contentItem.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-contentItem.qml
deleted file mode 100644
index 989c4521..00000000
--- a/src/imports/controls/doc/snippets/qtquickcontrols2-tumbler-contentItem.qml
+++ /dev/null
@@ -1,39 +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$
-**
-****************************************************************************/
-
-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/src/imports/controls/doc/src/includes/qquickswitch.qdocinc b/src/imports/controls/doc/src/includes/qquickswitch.qdocinc
index aee93a26..32ccbb89 100644
--- a/src/imports/controls/doc/src/includes/qquickswitch.qdocinc
+++ b/src/imports/controls/doc/src/includes/qquickswitch.qdocinc
@@ -4,7 +4,7 @@ This property holds the logical position of the thumb indicator.
The position is defined as a percentage of the indicator's size, scaled to
\c 0.0 - \c 1.0. The position can be used for example to determine whether
-the thumb has been dragged past the halfway. For visualizing a thumb
+the thumb has been dragged past the halfway point. For visualizing a thumb
indicator, the right-to-left aware \l visualPosition should be used instead.
\sa visualPosition
@@ -21,7 +21,7 @@ The position is defined as a percentage of the indicator's size, scaled to
value is equal to \c {1.0 - position}. This makes the value suitable for
visualizing the thumb indicator taking right-to-left support into account.
In order to for example determine whether the thumb has been dragged past
-the halfway, the logical \l position should be used instead.
+the halfway point, the logical \l position should be used instead.
\sa position
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc
index 19f1889e..559c89f0 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-customize.qdoc
@@ -585,7 +585,7 @@
SwipeDelegate consists of six visual items: \l {Control::background}{background},
\l {Control::contentItem}{content item}, \l {AbstractButton::indicator}{indicator},
- \c exposure.left, \c exposure.right, and \c exposure.behind.
+ \c swipe.left, \c swipe.right, and \c swipe.behind.
\image qtquickcontrols2-swipedelegate-custom.png
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-default.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-default.qdoc
index 8ff518f5..88faf25a 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-default.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-default.qdoc
@@ -45,6 +45,8 @@
does not implement a certain control, the Default style implementation of
that control is selected.
+ \b {See also} \l {Material Style}, \l {Universal Style}
+
\section1 Related Information
\list
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc
index c80f8ccd..31c8b196 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-differences.qdoc
@@ -130,7 +130,7 @@
\li C++
\endtable
- \b {* No hover support}
+ \b {* No hover effects}
\section2 Porting Qt Quick Controls Code
@@ -180,15 +180,18 @@
This works with both modules, and will reduce the amount of work needed
when the migration begins.
- \section3 Type Changes
+ \section3 Type Comparison Table
\table
\header
- \li Qt Quick Controls
- \li Qt Quick Controls 2
+ \li Qt Quick Controls 1, Qt Quick Extras
+ \li Qt Quick Controls 2, Qt Labs Calendar
+ \row
+ \li \mdash
+ \li \l [QML QtQuickControls2] {AbstractButton}
\row
\li \l [QML QtQuickControls] {Action}
- \li No equivalent; see \l [QML QtQuick] {Shortcut} instead.
+ \li \span {} {\mdash \nbsp \sub {(see \l [QML QtQuick] {Shortcut} instead)}}
\row
\li \l [QML QtQuickControls] {ApplicationWindow}
\li \l [QML QtQuickControls2] {ApplicationWindow}
@@ -199,23 +202,52 @@
\li \l [QML QtQuickControls] {Button}
\li \l [QML QtQuickControls2] {Button}
\row
+ \li \l [QML QtQuickExtras] {CircularGauge}
+ \li \mdash
+ \row
+ \li \mdash
+ \li \l [QML QtQuickControls2] {Control}
+ \row
+ \li \mdash
+ \li \l [QML QtQuickControls2] {Container}
+ \row
\li \l [QML QtQuickControls] {Calendar}
- \li No equivalent; see \l [QML] {MonthGrid}, \l [QML] {DayOfWeekRow} and \l [QML] {WeekNumberColumn} instead.
+ \li \l [QML QtLabsCalendar] {MonthGrid},
+ \l [QML QtLabsCalendar] {DayOfWeekRow},
+ \l [QML QtLabsCalendar] {WeekNumberColumn}
\row
\li \l [QML QtQuickControls] {CheckBox}
\li \l [QML QtQuickControls2] {CheckBox}
\row
+ \li \mdash
+ \li \l [QML QtQuickControls2] {CheckDelegate}
+ \row
\li \l [QML QtQuickControls] {ComboBox}
\li \l [QML QtQuickControls2] {ComboBox}
\row
+ \li \l [QML QtQuickExtras] {DelayButton}
+ \li \mdash
+ \row
+ \li \l [QML QtQuickExtras] {Dial}
+ \li \l [QML QtQuickControls2] {Dial}
+ \row
+ \li \mdash
+ \li \l [QML QtQuickControls2] {Drawer}
+ \row
\li \l [QML QtQuickControls] {ExclusiveGroup}
\li \l [QML QtQuickControls2] {ButtonGroup}
\row
+ \li \mdash
+ \li \l [QML QtQuickControls2] {Frame}
+ \row
+ \li \l [QML QtQuickExtras] {Gauge}
+ \li \mdash
+ \row
\li \l [QML QtQuickControls] {GroupBox}
-
- \li \l [QtQuickControls2] {GroupBox}, or \l [QML QtQuickControls2] {Frame}
- if a title is not required.
-
+ \li \l [QML QtQuickControls2] {GroupBox}
+ \row
+ \li \mdash
+ \li \l [QML QtQuickControls2] {ItemDelegate}
\row
\li \l [QML QtQuickControls] {Label}
\li \l [QML QtQuickControls2] {Label}
@@ -223,12 +255,39 @@
\li \l [QML QtQuickControls] {Menu}
\li \l [QML QtQuickControls2] {Menu}
\row
+ \li \l [QML QtQuickControls] {MenuItem}
+ \li \l [QML QtQuickControls2] {MenuItem}
+ \row
+ \li \mdash
+ \li \l [QML QtQuickControls2] {Page}
+ \row
+ \li \mdash
+ \li \l [QML QtQuickControls2] {PageIndicator}
+ \row
+ \li \mdash
+ \li \l [QML QtQuickControls2] {Pane}
+ \row
+ \li \l [QML QtQuickExtras] {Picture}
+ \li \mdash
+ \row
+ \li \l [QML QtQuickExtras] {PieMenu}
+ \li \mdash
+ \row
+ \li \mdash
+ \li \l [QML QtQuickControls2] {Popup}
+ \row
\li \l [QML QtQuickControls] {ProgressBar}
\li \l [QML QtQuickControls2] {ProgressBar}
\row
\li \l [QML QtQuickControls] {RadioButton}
\li \l [QML QtQuickControls2] {RadioButton}
\row
+ \li \mdash
+ \li \l [QML QtQuickControls2] {RadioDelegate}
+ \row
+ \li \mdash
+ \li \l [QML QtQuickControls2] {RangeSlider}
+ \row
\li \l [QML QtQuickControls] {ScrollView}
\li \l [QML QtQuickControls2] {ScrollBar},
\l [QML QtQuickControls2] {ScrollIndicator}
@@ -239,24 +298,36 @@
\li \l [QML QtQuickControls] {SpinBox}
\li \l [QML QtQuickControls2] {SpinBox}
\row
- \li \l [QML QtQuickControls] {Stack},
- \l [QML QtQuickControls] {StackView},
- \l [QML QtQuickControls] {StackViewDelegate}
+ \li \l [QML QtQuickControls] {StackView},
+ \l [QML QtQuickControls] {StackViewDelegate},
+ \l [QML QtQuickControls] {Stack}
\li \l [QML QtQuickControls2] {StackView}
\row
\li \l [QML QtQuickControls] {StatusBar}
- \li No equivalent
+ \li \mdash
+ \row
+ \li \l [QML QtQuickExtras] {StatusIndicator}
+ \li \mdash
+ \row
+ \li \mdash
+ \li \l [QML QtQuickControls2] {SwipeDelegate}
+ \row
+ \li \mdash
+ \li \l [QML QtQuickControls2] {SwipeView}
\row
\li \l [QML QtQuickControls] {Switch}
\li \l [QML QtQuickControls2] {Switch}
\row
- \li \l [QML QtQuickControls] {Tab},
- \l [QML QtQuickControls] {TabView}
- \li \l [QML QtQuickControls2] {TabBar} in combination with, for example,
- \l [QML QtQuickControls2] {SwipeView}.
+ \li \mdash
+ \li \l [QML QtQuickControls2] {SwitchDelegate}
+ \row
+ \li \l [QML QtQuickControls] {TabView},
+ \l [QML QtQuickControls] {Tab}
+ \li \l [QML QtQuickControls2] {TabBar},
+ \l [QML QtQuickControls2] {TabButton}
\row
\li \l [QML QtQuickControls] {TableView}
- \li No equivalent
+ \li \mdash
\row
\li \l [QML QtQuickControls] {TextArea}
\li \l [QML QtQuickControls2] {TextArea}
@@ -264,21 +335,32 @@
\li \l [QML QtQuickControls] {TextField}
\li \l [QML QtQuickControls2] {TextField}
\row
+ \li \l [QML QtQuickExtras] {ToggleButton}
+ \li \mdash
+ \row
\li \l [QML QtQuickControls] {ToolBar}
\li \l [QML QtQuickControls2] {ToolBar}
\row
\li \l [QML QtQuickControls] {ToolButton}
\li \l [QML QtQuickControls2] {ToolButton}
\row
+ \li \mdash
+ \li \l [QML QtQuickControls2] {ToolTip}
+ \row
\li \l [QML QtQuickControls] {TreeView}
- \li No equivalent
+ \li \mdash
+ \row
+ \li \l [QML QtQuickExtras] {Tumbler},
+ \l [QML QtQuickExtras] {TumblerColumn}
+ \li \l [QML QtQuickControls2] {Tumbler}
\endtable
\section1 Related Information
\list
\li \l{Qt Quick}
- \li \l{Qt Quick Controls}
\li \l{Qt Quick Controls 2 QML Types}
+ \li \l{Qt Quick Controls QML Types}
+ \li \l{Qt Quick Extras QML Types}
\endlist
*/
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc
index b96ffaa0..cf5d8840 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-material.qdoc
@@ -32,7 +32,7 @@
The Material Style is based on the Google Material Design Guidelines.
\l{detailed-desc-material}{More...}
- \styleimport {QtQuick.Controls.Material 2.0}
+ \styleimport {QtQuick.Controls.Material 2.0} {Qt 5.7}
\section1 Attached Properties
@@ -44,6 +44,12 @@
\li \l {theme-attached-prop}{\b theme} : enumeration
\endlist
+ \section1 Attached Methods
+
+ \list
+ \li color \l {color-attached-method}{\b color}(enumeration predefined)
+ \endlist
+
\section1 Detailed Description
\target detailed-desc-material
@@ -200,6 +206,8 @@
\value Material.Grey \stylecolor {#9E9E9E} {}
\value Material.BlueGrey \stylecolor {#607D8B} {}
+ \b {See also} \l {Default Style}, \l {Universal Style}
+
\section1 Attached Property Documentation
\styleproperty {Material.accent} {color} {accent-attached-prop}
@@ -262,6 +270,24 @@
\endstyleproperty
+ \section1 Attached Method Documentation
+
+ \stylemethod {color} {color} {enumeration} {predefined} {color-attached-method}
+ \target color-attached-method
+ This attached method returns the color value of the specified \l {pre-defined colors}
+ {pre-defined color}.
+
+ \qml
+ import QtQuick 2.0
+ import QtQuick.Controls.Material 2.0
+
+ Rectangle {
+ color: Material.color(Material.Red)
+ }
+ \endqml
+
+ \endstylemethod
+
\section1 Related Information
\list
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-popups.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-popups.qdoc
index 0d70028f..2ea21f3f 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-popups.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-popups.qdoc
@@ -42,20 +42,49 @@
\l Drawer provides a swipe-based side panel, similar to those often used
in touch interfaces to provide a central location for navigation.
+ The drawer can be positioned at any of the four edges of the screen. It allows
+ the user to add navigation without taking up valuable screen space. The user can
+ show and hide the drawer at any time with a simple swipe movement.
+
\section1 Menu Control
\image qtquickcontrols2-menu.png
- \l Menu is a traditional menu.
+ The \l Menu control displays a vertical list of items that can be selected. It can
+ be used for offering a list of actions that can be taken in a given context.
\section1 Popup Control
- \l Popup is the base type of popup-like user interface controls.
+ \image qtquickcontrols2-popup-settings.png
+
+ A \l Popup displays content over other application content.
+ It prompts the user to make a decision or enter information.
+
+ Popups can be modal or non-modal. A modal popup blocks users from interacting
+ with the application until they have made a choice and closed the popup.
+
+ A popup can be used for:
+
+ \list
+ \li communicating a message to the user that he must read and acknowledge.
+ \li displaying an error message.
+ \li prompting the user to make a choice and/or enter a value.
+ \endlist
\section1 ToolTip Control
\image qtquickcontrols2-tooltip.png
\l ToolTip shows a short piece of text that informs the user of a control's
- function. It is typically placed above or below the parent control.
+ function.
+
+ Recommendations:
+ \list
+ \li Use a tooltip if a control has little or no descriptive text, or needs
+ a short explanation.
+ \li Use a tooltip only if the information on a particular control is not
+ available elsewhere in the screen.
+ \li Keep the tooltip text short so that it does not cover other content
+ while being displayed.
+ \endlist
*/
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc
index d2c4c5f3..98f9a212 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-styles.qdoc
@@ -29,11 +29,46 @@
\page qtquickcontrols2-styles.html
\title Styling Qt Quick Controls 2
- Qt Quick Controls 2 comes with a selection of styles. The \l {Default Style}
- {Default} style is a simple and light-weight all-round style that offers
- the maximum performance for Qt Quick Controls 2. The more advanced
- \l {Universal Style}{Universal} and \l {Material Style}{Material} styles
- offer an appealing design, but require more system resources.
+ Qt Quick Controls 2 comes with a selection of styles.
+
+ \raw HTML
+ <table style="background:transparent; border:0px">
+ <tr>
+ <td style="border:0px">
+ <a href="qtquickcontrols2-default.html">
+ <img src="images/qtquickcontrols2-default.png" width="45%"/>
+ </a>
+ </td>
+ <td style="border:0px">
+ <a href="qtquickcontrols2-material.html">
+ <img src="images/qtquickcontrols2-material.png" width="75%"/>
+ </a>
+ </td>
+ <td style="border:0px">
+ <a href="qtquickcontrols2-universal.html">
+ <img src="images/qtquickcontrols2-universal.png" width="75%"/>
+ </a>
+ </td>
+ </tr>
+ <tr>
+ <td style="border:0px">
+ The <a href="qtquickcontrols2-default.html">Default</a> style is
+ a simple and light-weight all-round style that offers the maximum
+ performance for Qt Quick Controls 2.
+ </td>
+ <td style="border:0px">
+ The <a href="qtquickcontrols2-material.html">Material</a> style offers an appealing design
+ based on the <a href="https://www.google.com/design/spec/material-design/introduction.html">
+ Google Material Design Guidelines</a>, but requires more system resources than the Default style.
+ </td>
+ <td style="border:0px">
+ The <a href="qtquickcontrols2-universal.html">Universal</a> style offers an appealing design
+ based on the <a href="https://dev.windows.com/design">Microsoft Universal Design Guidelines</a>,
+ but requires more system resources than the Default style.
+ </td>
+ </tr>
+ </table>
+ \endraw
\section1 Using Styles in Qt Quick Controls 2
@@ -48,7 +83,7 @@
\section2 Using QQuickStyle in C++
- \l QQuickStyle provides API configuring a specific style. The following
+ \l QQuickStyle provides API for configuring a specific style. The following
example runs a Qt Quick Controls 2 application with the Material style:
\code
diff --git a/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc
index ac2c051d..fbfca8d1 100644
--- a/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc
+++ b/src/imports/controls/doc/src/qtquickcontrols2-universal.qdoc
@@ -32,7 +32,7 @@
The Universal Style is based on the Microsoft Universal Design Guidelines.
\l {detailed-desc-universal}{More...}
- \styleimport {QtQuick.Controls.Universal 2.0}
+ \styleimport {QtQuick.Controls.Universal 2.0} {Qt 5.7}
\section1 Attached Properties
@@ -43,6 +43,12 @@
\li \l {theme-attached-prop}{\b theme} : enumeration
\endlist
+ \section1 Attached Methods
+
+ \list
+ \li color \l {color-attached-method}{\b color}(enumeration predefined)
+ \endlist
+
\section1 Detailed Description
\target detailed-desc-universal
@@ -159,6 +165,8 @@
style-specific tweaks can be applied without creating a hard dependency to
a style.
+ \b {See also} \l {Default Style}, \l {Material Style}
+
\section1 Attached Property Documentation
\styleproperty {Universal.accent} {color} {accent-attached-prop}
@@ -225,6 +233,24 @@
\endstyleproperty
+ \section1 Attached Method Documentation
+
+ \stylemethod {color} {color} {enumeration} {predefined} {color-attached-method}
+ \target color-attached-method
+ This attached method returns the color value of the specified \l {pre-defined colors}
+ {pre-defined color}.
+
+ \qml
+ import QtQuick 2.0
+ import QtQuick.Controls.Universal 2.0
+
+ Rectangle {
+ color: Universal.color(Universal.Red)
+ }
+ \endqml
+
+ \endstylemethod
+
\section1 Related Information
\list
diff --git a/src/imports/controls/material/CheckIndicator.qml b/src/imports/controls/material/CheckIndicator.qml
index c541e221..f64ca168 100644
--- a/src/imports/controls/material/CheckIndicator.qml
+++ b/src/imports/controls/material/CheckIndicator.qml
@@ -42,7 +42,7 @@ Rectangle {
implicitWidth: 18
implicitHeight: 18
color: "transparent"
- border.color: control.checked ? control.Material.accentColor : control.Material.secondaryTextColor
+ border.color: control.checked && control.enabled ? control.Material.accentColor : control.Material.secondaryTextColor
border.width: control.checked ? width / 2 : 2
radius: 2
@@ -81,15 +81,31 @@ Rectangle {
source: "qrc:/qt-project.org/imports/QtQuick/Controls.2/Material/images/check.png"
fillMode: Image.PreserveAspectFit
- scale: control.checked ? 1 : 0
+ scale: control.checkState === Qt.Checked ? 1 : 0
Behavior on scale { NumberAnimation { duration: 100 } }
}
- states: State {
- name: "checked"
- when: control.checked
+ Rectangle {
+ x: (parent.width - width) / 2
+ y: (parent.height - height) / 2
+ width: 12
+ height: 3
+
+ scale: control.checkState === Qt.PartiallyChecked ? 1 : 0
+ Behavior on scale { NumberAnimation { duration: 100 } }
}
+ states: [
+ State {
+ name: "checked"
+ when: control.checkState === Qt.Checked
+ },
+ State {
+ name: "partiallychecked"
+ when: control.checkState === Qt.PartiallyChecked
+ }
+ ]
+
transitions: Transition {
SequentialAnimation {
NumberAnimation {
diff --git a/src/imports/controls/material/ElevationEffect.qml b/src/imports/controls/material/ElevationEffect.qml
index 93a32f83..4ee4369c 100644
--- a/src/imports/controls/material/ElevationEffect.qml
+++ b/src/imports/controls/material/ElevationEffect.qml
@@ -215,7 +215,7 @@ Item {
The current shadow based on the elevation.
*/
- readonly property var _shadow: _shadows[elevation]
+ readonly property var _shadow: _shadows[Math.max(0, Math.min(elevation, _shadows.length - 1))]
// Nest the shadows and source view in two items rendered as a layer
// so the shadow is not clipped by the bounds of the source view
diff --git a/src/imports/controls/material/SpinBox.qml b/src/imports/controls/material/SpinBox.qml
index e007013b..567fbfe5 100644
--- a/src/imports/controls/material/SpinBox.qml
+++ b/src/imports/controls/material/SpinBox.qml
@@ -126,14 +126,14 @@ T.SpinBox {
y: (parent.height - height) / 2
width: Math.min(parent.width / 3, parent.width / 3)
height: 2
- color: control.Material.primaryTextColor
+ color: enabled ? control.Material.primaryTextColor : control.Material.spinBoxDisabledIconColor
}
Rectangle {
x: (parent.width - width) / 2
y: (parent.height - height) / 2
width: 2
height: Math.min(parent.width / 3, parent.width / 3)
- color: control.Material.primaryTextColor
+ color: enabled ? control.Material.primaryTextColor : control.Material.spinBoxDisabledIconColor
}
}
//! [up.indicator]
@@ -156,7 +156,7 @@ T.SpinBox {
y: (parent.height - height) / 2
width: parent.width / 3
height: 2
- color: control.Material.primaryTextColor
+ color: enabled ? control.Material.primaryTextColor : control.Material.spinBoxDisabledIconColor
}
}
//! [down.indicator]
diff --git a/src/imports/controls/material/qquickmaterialstyle.cpp b/src/imports/controls/material/qquickmaterialstyle.cpp
index 8ad1ba66..76d81e5f 100644
--- a/src/imports/controls/material/qquickmaterialstyle.cpp
+++ b/src/imports/controls/material/qquickmaterialstyle.cpp
@@ -415,6 +415,8 @@ static const QRgb switchDisabledTrackColorLight = 0x1E000000;
static const QRgb switchDisabledTrackColorDark = 0x19FFFFFF;
static const QRgb checkBoxUncheckedRippleColorLight = 0x10000000;
static const QRgb checkBoxUncheckedRippleColorDark = 0x20FFFFFF;
+static const QRgb spinBoxDisabledIconColorLight = 0xFFCCCCCC;
+static const QRgb spinBoxDisabledIconColorDark = 0xFF666666;
static QColor alphaBlend(const QColor &bg, const QColor &fg)
{
@@ -574,7 +576,10 @@ void QQuickMaterialStyle::resetPrimary()
m_customPrimary = false;
m_explicitPrimary = false;
QQuickMaterialStyle *material = qobject_cast<QQuickMaterialStyle *>(parentStyle());
- inheritPrimary(material ? material->m_primary : defaultPrimary, true);
+ if (material)
+ inheritPrimary(material->m_primary, material->m_customPrimary);
+ else
+ inheritPrimary(defaultPrimary, false);
}
QVariant QQuickMaterialStyle::accent() const
@@ -630,7 +635,10 @@ void QQuickMaterialStyle::resetAccent()
m_customAccent = false;
m_explicitAccent = false;
QQuickMaterialStyle *material = qobject_cast<QQuickMaterialStyle *>(parentStyle());
- inheritAccent(material ? material->m_accent : defaultAccent, true);
+ if (material)
+ inheritAccent(material->m_accent, material->m_customAccent);
+ else
+ inheritAccent(defaultAccent, false);
}
QVariant QQuickMaterialStyle::foreground() const
@@ -1073,6 +1081,11 @@ QColor QQuickMaterialStyle::toolTextColor() const
return primaryTextColor();
}
+QColor QQuickMaterialStyle::spinBoxDisabledIconColor() const
+{
+ return QColor::fromRgba(m_theme == Light ? spinBoxDisabledIconColorLight : spinBoxDisabledIconColorDark);
+}
+
QColor QQuickMaterialStyle::color(QQuickMaterialStyle::Color color, QQuickMaterialStyle::Shade shade) const
{
int count = sizeof(colors) / sizeof(colors[0]);
diff --git a/src/imports/controls/material/qquickmaterialstyle_p.h b/src/imports/controls/material/qquickmaterialstyle_p.h
index 2686d14b..59858a5e 100644
--- a/src/imports/controls/material/qquickmaterialstyle_p.h
+++ b/src/imports/controls/material/qquickmaterialstyle_p.h
@@ -104,6 +104,7 @@ class QQuickMaterialStyle : public QQuickStyleAttached
Q_PROPERTY(QColor listHighlightColor READ listHighlightColor NOTIFY paletteChanged FINAL)
Q_PROPERTY(QColor tooltipColor READ tooltipColor NOTIFY paletteChanged FINAL)
Q_PROPERTY(QColor toolTextColor READ toolTextColor NOTIFY paletteChanged FINAL)
+ Q_PROPERTY(QColor spinBoxDisabledIconColor READ spinBoxDisabledIconColor NOTIFY paletteChanged FINAL)
public:
enum Theme {
@@ -232,6 +233,7 @@ public:
QColor listHighlightColor() const;
QColor tooltipColor() const;
QColor toolTextColor() const;
+ QColor spinBoxDisabledIconColor() const;
Q_INVOKABLE QColor color(Color color, Shade shade = Shade500) const;
Q_INVOKABLE QColor shade(const QColor &color, Shade shade) const;
diff --git a/src/imports/controls/plugins.qmltypes b/src/imports/controls/plugins.qmltypes
index eab2a899..d243cef3 100644
--- a/src/imports/controls/plugins.qmltypes
+++ b/src/imports/controls/plugins.qmltypes
@@ -4,14 +4,82 @@ import QtQuick.tooling 1.2
// It is used for QML tooling purposes only.
//
// This file was auto-generated by:
-// 'qmlplugindump -nonrelocatable QtQuick.Controls 2.0'
+// 'qmlplugindump -nonrelocatable QtQuick.Controls 2.0 -merge ..\templates\plugins.qmltypes -dependencies dep.json'
Module {
- dependencies: [
- "QtQuick 2.6",
- "QtQuick.Templates 2.0",
- "QtQuick.Window 2.2"
- ]
+ dependencies: ["QtQuick.Templates 2.0", "QtQuick.Window 2.2"]
+ Component {
+ name: "QQuickAbstractAnimation"
+ prototype: "QObject"
+ Enum {
+ name: "Loops"
+ values: {
+ "Infinite": -2
+ }
+ }
+ Property { name: "running"; type: "bool" }
+ Property { name: "paused"; type: "bool" }
+ Property { name: "alwaysRunToEnd"; type: "bool" }
+ Property { name: "loops"; type: "int" }
+ Signal { name: "started" }
+ Signal { name: "stopped" }
+ Signal {
+ name: "runningChanged"
+ Parameter { type: "bool" }
+ }
+ Signal {
+ name: "pausedChanged"
+ Parameter { type: "bool" }
+ }
+ Signal {
+ name: "alwaysRunToEndChanged"
+ Parameter { type: "bool" }
+ }
+ Signal {
+ name: "loopCountChanged"
+ Parameter { type: "int" }
+ }
+ Method { name: "restart" }
+ Method { name: "start" }
+ Method { name: "pause" }
+ Method { name: "resume" }
+ Method { name: "stop" }
+ Method { name: "complete" }
+ }
+ Component {
+ name: "QQuickAnimator"
+ prototype: "QQuickAbstractAnimation"
+ exports: [
+ "QtQuick.Controls.impl/BusyRingAnimator 2.0",
+ "QtQuick.Controls.impl/ProgressStripAnimator 2.0"
+ ]
+ exportMetaObjectRevisions: [0, 0]
+ Property { name: "target"; type: "QQuickItem"; isPointer: true }
+ Property { name: "easing"; type: "QEasingCurve" }
+ Property { name: "duration"; type: "int" }
+ Property { name: "to"; type: "double" }
+ Property { name: "from"; type: "double" }
+ Signal {
+ name: "targetItemChanged"
+ Parameter { type: "QQuickItem"; isPointer: true }
+ }
+ Signal {
+ name: "durationChanged"
+ Parameter { name: "duration"; type: "int" }
+ }
+ Signal {
+ name: "easingChanged"
+ Parameter { name: "curve"; type: "QEasingCurve" }
+ }
+ Signal {
+ name: "toChanged"
+ Parameter { name: "to"; type: "double" }
+ }
+ Signal {
+ name: "fromChanged"
+ Parameter { name: "from"; type: "double" }
+ }
+ }
Component {
name: "QQuickBusyIndicatorRing"
defaultProperty: "data"
@@ -51,6 +119,24 @@ Module {
Property { name: "color"; type: "QColor" }
}
Component {
+ name: "QQuickPaintedItem"
+ defaultProperty: "data"
+ prototype: "QQuickItem"
+ Enum {
+ name: "RenderTarget"
+ values: {
+ "Image": 0,
+ "FramebufferObject": 1,
+ "InvertedYFramebufferObject": 2
+ }
+ }
+ Property { name: "contentsSize"; type: "QSize" }
+ Property { name: "fillColor"; type: "QColor" }
+ Property { name: "contentsScale"; type: "double" }
+ Property { name: "renderTarget"; type: "RenderTarget" }
+ Property { name: "textureSize"; type: "QSize" }
+ }
+ Component {
name: "QQuickProgressStrip"
defaultProperty: "data"
prototype: "QQuickItem"
@@ -100,13 +186,17 @@ Module {
defaultProperty: "data"
}
Component {
- prototype: "QQuickRectangle"
+ prototype: "QQuickItem"
name: "QtQuick.Controls.impl/CheckIndicator 2.0"
exports: ["QtQuick.Controls.impl/CheckIndicator 2.0"]
exportMetaObjectRevisions: [0]
isComposite: true
defaultProperty: "data"
Property { name: "control"; type: "QQuickItem"; isPointer: true }
+ Property { name: "color"; type: "QColor" }
+ Property { name: "gradient"; type: "QQuickGradient"; isPointer: true }
+ Property { name: "border"; type: "QQuickPen"; isReadonly: true; isPointer: true }
+ Property { name: "radius"; type: "double" }
}
Component {
prototype: "QQuickComboBox"
@@ -237,13 +327,17 @@ Module {
defaultProperty: "data"
}
Component {
- prototype: "QQuickRectangle"
+ prototype: "QQuickItem"
name: "QtQuick.Controls.impl/RadioIndicator 2.0"
exports: ["QtQuick.Controls.impl/RadioIndicator 2.0"]
exportMetaObjectRevisions: [0]
isComposite: true
defaultProperty: "data"
Property { name: "control"; type: "QQuickItem"; isPointer: true }
+ Property { name: "color"; type: "QColor" }
+ Property { name: "gradient"; type: "QQuickGradient"; isPointer: true }
+ Property { name: "border"; type: "QQuickPen"; isReadonly: true; isPointer: true }
+ Property { name: "radius"; type: "double" }
}
Component {
prototype: "QQuickRangeSlider"
@@ -398,4 +492,1749 @@ Module {
isComposite: true
defaultProperty: "data"
}
+ Component {
+ name: "QQuickAbstractButton"
+ defaultProperty: "data"
+ prototype: "QQuickControl"
+ exports: ["QtQuick.Templates/AbstractButton 2.0"]
+ exportMetaObjectRevisions: [0]
+ Property { name: "text"; type: "string" }
+ Property { name: "down"; type: "bool" }
+ Property { name: "pressed"; type: "bool"; isReadonly: true }
+ Property { name: "checked"; type: "bool" }
+ Property { name: "autoExclusive"; type: "bool" }
+ Property { name: "indicator"; type: "QQuickItem"; isPointer: true }
+ Signal { name: "pressed" }
+ Signal { name: "released" }
+ Signal { name: "canceled" }
+ Signal { name: "clicked" }
+ Signal { name: "pressAndHold" }
+ Signal { name: "doubleClicked" }
+ Method { name: "toggle" }
+ }
+ Component {
+ name: "QQuickApplicationWindow"
+ defaultProperty: "data"
+ prototype: "QQuickWindowQmlImpl"
+ exports: ["QtQuick.Templates/ApplicationWindow 2.0"]
+ exportMetaObjectRevisions: [0]
+ attachedType: "QQuickApplicationWindowAttached"
+ Property { name: "background"; type: "QQuickItem"; isPointer: true }
+ Property { name: "contentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true }
+ Property { name: "data"; type: "QObject"; isList: true; isReadonly: true }
+ Property { name: "activeFocusControl"; type: "QQuickItem"; isReadonly: true; isPointer: true }
+ Property { name: "header"; type: "QQuickItem"; isPointer: true }
+ Property { name: "footer"; type: "QQuickItem"; isPointer: true }
+ Property { name: "overlay"; type: "QQuickOverlay"; isReadonly: true; isPointer: true }
+ Property { name: "font"; type: "QFont" }
+ Property { name: "locale"; type: "QLocale" }
+ }
+ Component {
+ name: "QQuickApplicationWindowAttached"
+ prototype: "QObject"
+ Property { name: "window"; type: "QQuickApplicationWindow"; isReadonly: true; isPointer: true }
+ Property { name: "contentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true }
+ Property { name: "activeFocusControl"; type: "QQuickItem"; isReadonly: true; isPointer: true }
+ Property { name: "header"; type: "QQuickItem"; isReadonly: true; isPointer: true }
+ Property { name: "footer"; type: "QQuickItem"; isReadonly: true; isPointer: true }
+ Property { name: "overlay"; type: "QQuickOverlay"; isReadonly: true; isPointer: true }
+ }
+ Component {
+ name: "QQuickBusyIndicator"
+ defaultProperty: "data"
+ prototype: "QQuickControl"
+ exports: ["QtQuick.Templates/BusyIndicator 2.0"]
+ exportMetaObjectRevisions: [0]
+ Property { name: "running"; type: "bool" }
+ }
+ Component {
+ name: "QQuickButton"
+ defaultProperty: "data"
+ prototype: "QQuickAbstractButton"
+ exports: ["QtQuick.Templates/Button 2.0"]
+ exportMetaObjectRevisions: [0]
+ Property { name: "checkable"; type: "bool" }
+ Property { name: "autoRepeat"; type: "bool" }
+ Property { name: "highlighted"; type: "bool" }
+ Property { name: "flat"; type: "bool" }
+ }
+ Component {
+ name: "QQuickCheckBox"
+ defaultProperty: "data"
+ prototype: "QQuickAbstractButton"
+ exports: ["QtQuick.Templates/CheckBox 2.0"]
+ exportMetaObjectRevisions: [0]
+ Property { name: "tristate"; type: "bool" }
+ Property { name: "checkState"; type: "Qt::CheckState" }
+ }
+ Component {
+ name: "QQuickCheckDelegate"
+ defaultProperty: "data"
+ prototype: "QQuickItemDelegate"
+ exports: ["QtQuick.Templates/CheckDelegate 2.0"]
+ exportMetaObjectRevisions: [0]
+ Property { name: "tristate"; type: "bool" }
+ Property { name: "checkState"; type: "Qt::CheckState" }
+ }
+ Component {
+ name: "QQuickComboBox"
+ defaultProperty: "data"
+ prototype: "QQuickControl"
+ exports: ["QtQuick.Templates/ComboBox 2.0"]
+ exportMetaObjectRevisions: [0]
+ Property { name: "count"; type: "int"; isReadonly: true }
+ Property { name: "model"; type: "QVariant" }
+ Property { name: "delegateModel"; type: "QQmlInstanceModel"; isReadonly: true; isPointer: true }
+ Property { name: "pressed"; type: "bool" }
+ Property { name: "highlightedIndex"; type: "int"; isReadonly: true }
+ Property { name: "currentIndex"; type: "int" }
+ Property { name: "currentText"; type: "string"; isReadonly: true }
+ Property { name: "displayText"; type: "string" }
+ Property { name: "textRole"; type: "string" }
+ Property { name: "delegate"; type: "QQmlComponent"; isPointer: true }
+ Property { name: "indicator"; type: "QQuickItem"; isPointer: true }
+ Property { name: "popup"; type: "QQuickPopup"; isPointer: true }
+ Signal {
+ name: "activated"
+ Parameter { name: "index"; type: "int" }
+ }
+ Signal {
+ name: "highlighted"
+ Parameter { name: "index"; type: "int" }
+ }
+ Method { name: "incrementCurrentIndex" }
+ Method { name: "decrementCurrentIndex" }
+ Method {
+ name: "textAt"
+ type: "string"
+ Parameter { name: "index"; type: "int" }
+ }
+ Method {
+ name: "find"
+ type: "int"
+ Parameter { name: "text"; type: "string" }
+ Parameter { name: "flags"; type: "Qt::MatchFlags" }
+ }
+ Method {
+ name: "find"
+ type: "int"
+ Parameter { name: "text"; type: "string" }
+ }
+ }
+ Component {
+ name: "QQuickContainer"
+ defaultProperty: "contentData"
+ prototype: "QQuickControl"
+ exports: ["QtQuick.Templates/Container 2.0"]
+ exportMetaObjectRevisions: [0]
+ Property { name: "count"; type: "int"; isReadonly: true }
+ Property { name: "contentModel"; type: "QVariant"; isReadonly: true }
+ Property { name: "contentData"; type: "QObject"; isList: true; isReadonly: true }
+ Property { name: "contentChildren"; type: "QQuickItem"; isList: true; isReadonly: true }
+ Property { name: "currentIndex"; type: "int" }
+ Property { name: "currentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true }
+ Method {
+ name: "setCurrentIndex"
+ Parameter { name: "index"; type: "int" }
+ }
+ Method {
+ name: "itemAt"
+ type: "QQuickItem*"
+ Parameter { name: "index"; type: "int" }
+ }
+ Method {
+ name: "addItem"
+ Parameter { name: "item"; type: "QQuickItem"; isPointer: true }
+ }
+ Method {
+ name: "insertItem"
+ Parameter { name: "index"; type: "int" }
+ Parameter { name: "item"; type: "QQuickItem"; isPointer: true }
+ }
+ Method {
+ name: "moveItem"
+ Parameter { name: "from"; type: "int" }
+ Parameter { name: "to"; type: "int" }
+ }
+ Method {
+ name: "removeItem"
+ Parameter { name: "index"; type: "int" }
+ }
+ }
+ Component {
+ name: "QQuickControl"
+ defaultProperty: "data"
+ prototype: "QQuickItem"
+ exports: ["QtQuick.Templates/Control 2.0"]
+ exportMetaObjectRevisions: [0]
+ Property { name: "font"; type: "QFont" }
+ Property { name: "availableWidth"; type: "double"; isReadonly: true }
+ Property { name: "availableHeight"; type: "double"; isReadonly: true }
+ Property { name: "padding"; type: "double" }
+ Property { name: "topPadding"; type: "double" }
+ Property { name: "leftPadding"; type: "double" }
+ Property { name: "rightPadding"; type: "double" }
+ Property { name: "bottomPadding"; type: "double" }
+ Property { name: "spacing"; type: "double" }
+ Property { name: "locale"; type: "QLocale" }
+ Property { name: "mirrored"; type: "bool"; isReadonly: true }
+ Property { name: "focusPolicy"; type: "Qt::FocusPolicy" }
+ Property { name: "focusReason"; type: "Qt::FocusReason" }
+ Property { name: "visualFocus"; type: "bool"; isReadonly: true }
+ Property { name: "hovered"; type: "bool"; isReadonly: true }
+ Property { name: "hoverEnabled"; type: "bool" }
+ Property { name: "wheelEnabled"; type: "bool" }
+ Property { name: "background"; type: "QQuickItem"; isPointer: true }
+ Property { name: "contentItem"; type: "QQuickItem"; isPointer: true }
+ }
+ Component {
+ name: "QQuickDial"
+ defaultProperty: "data"
+ prototype: "QQuickControl"
+ exports: ["QtQuick.Templates/Dial 2.0"]
+ exportMetaObjectRevisions: [0]
+ Enum {
+ name: "SnapMode"
+ values: {
+ "NoSnap": 0,
+ "SnapAlways": 1,
+ "SnapOnRelease": 2
+ }
+ }
+ Property { name: "from"; type: "double" }
+ Property { name: "to"; type: "double" }
+ Property { name: "value"; type: "double" }
+ Property { name: "position"; type: "double"; isReadonly: true }
+ Property { name: "angle"; type: "double"; isReadonly: true }
+ Property { name: "stepSize"; type: "double" }
+ Property { name: "snapMode"; type: "SnapMode" }
+ Property { name: "wrap"; type: "bool" }
+ Property { name: "pressed"; type: "bool"; isReadonly: true }
+ Property { name: "handle"; type: "QQuickItem"; isPointer: true }
+ Method { name: "increase" }
+ Method { name: "decrease" }
+ }
+ Component {
+ name: "QQuickDrawer"
+ defaultProperty: "contentData"
+ prototype: "QQuickPopup"
+ exports: ["QtQuick.Templates/Drawer 2.0"]
+ exportMetaObjectRevisions: [0]
+ Property { name: "edge"; type: "Qt::Edge" }
+ Property { name: "position"; type: "double" }
+ Property { name: "dragMargin"; type: "double" }
+ }
+ Component {
+ name: "QQuickFrame"
+ defaultProperty: "contentData"
+ prototype: "QQuickPane"
+ exports: ["QtQuick.Templates/Frame 2.0"]
+ exportMetaObjectRevisions: [0]
+ }
+ Component {
+ name: "QQuickGroupBox"
+ defaultProperty: "contentData"
+ prototype: "QQuickFrame"
+ exports: ["QtQuick.Templates/GroupBox 2.0"]
+ exportMetaObjectRevisions: [0]
+ Property { name: "title"; type: "string" }
+ Property { name: "label"; type: "QQuickItem"; isPointer: true }
+ }
+ Component {
+ name: "QQuickImplicitSizeItem"
+ defaultProperty: "data"
+ prototype: "QQuickItem"
+ Property { name: "implicitWidth"; type: "double"; isReadonly: true }
+ Property { name: "implicitHeight"; type: "double"; isReadonly: true }
+ Signal { name: "implicitWidthChanged2"; revision: 1 }
+ Signal { name: "implicitHeightChanged2"; revision: 1 }
+ }
+ Component {
+ name: "QQuickItem"
+ defaultProperty: "data"
+ prototype: "QObject"
+ Enum {
+ name: "TransformOrigin"
+ values: {
+ "TopLeft": 0,
+ "Top": 1,
+ "TopRight": 2,
+ "Left": 3,
+ "Center": 4,
+ "Right": 5,
+ "BottomLeft": 6,
+ "Bottom": 7,
+ "BottomRight": 8
+ }
+ }
+ Property { name: "parent"; type: "QQuickItem"; isPointer: true }
+ Property { name: "data"; type: "QObject"; isList: true; isReadonly: true }
+ Property { name: "resources"; type: "QObject"; isList: true; isReadonly: true }
+ Property { name: "children"; type: "QQuickItem"; isList: true; isReadonly: true }
+ Property { name: "x"; type: "double" }
+ Property { name: "y"; type: "double" }
+ Property { name: "z"; type: "double" }
+ Property { name: "width"; type: "double" }
+ Property { name: "height"; type: "double" }
+ Property { name: "opacity"; type: "double" }
+ Property { name: "enabled"; type: "bool" }
+ Property { name: "visible"; type: "bool" }
+ Property { name: "visibleChildren"; type: "QQuickItem"; isList: true; isReadonly: true }
+ Property { name: "states"; type: "QQuickState"; isList: true; isReadonly: true }
+ Property { name: "transitions"; type: "QQuickTransition"; isList: true; isReadonly: true }
+ Property { name: "state"; type: "string" }
+ Property { name: "childrenRect"; type: "QRectF"; isReadonly: true }
+ Property { name: "anchors"; type: "QQuickAnchors"; isReadonly: true; isPointer: true }
+ Property { name: "left"; type: "QQuickAnchorLine"; isReadonly: true }
+ Property { name: "right"; type: "QQuickAnchorLine"; isReadonly: true }
+ Property { name: "horizontalCenter"; type: "QQuickAnchorLine"; isReadonly: true }
+ Property { name: "top"; type: "QQuickAnchorLine"; isReadonly: true }
+ Property { name: "bottom"; type: "QQuickAnchorLine"; isReadonly: true }
+ Property { name: "verticalCenter"; type: "QQuickAnchorLine"; isReadonly: true }
+ Property { name: "baseline"; type: "QQuickAnchorLine"; isReadonly: true }
+ Property { name: "baselineOffset"; type: "double" }
+ Property { name: "clip"; type: "bool" }
+ Property { name: "focus"; type: "bool" }
+ Property { name: "activeFocus"; type: "bool"; isReadonly: true }
+ Property { name: "activeFocusOnTab"; revision: 1; type: "bool" }
+ Property { name: "rotation"; type: "double" }
+ Property { name: "scale"; type: "double" }
+ Property { name: "transformOrigin"; type: "TransformOrigin" }
+ Property { name: "transformOriginPoint"; type: "QPointF"; isReadonly: true }
+ Property { name: "transform"; type: "QQuickTransform"; isList: true; isReadonly: true }
+ Property { name: "smooth"; type: "bool" }
+ Property { name: "antialiasing"; type: "bool" }
+ Property { name: "implicitWidth"; type: "double" }
+ Property { name: "implicitHeight"; type: "double" }
+ Property { name: "layer"; type: "QQuickItemLayer"; isReadonly: true; isPointer: true }
+ Signal {
+ name: "childrenRectChanged"
+ Parameter { type: "QRectF" }
+ }
+ Signal {
+ name: "baselineOffsetChanged"
+ Parameter { type: "double" }
+ }
+ Signal {
+ name: "stateChanged"
+ Parameter { type: "string" }
+ }
+ Signal {
+ name: "focusChanged"
+ Parameter { type: "bool" }
+ }
+ Signal {
+ name: "activeFocusChanged"
+ Parameter { type: "bool" }
+ }
+ Signal {
+ name: "activeFocusOnTabChanged"
+ revision: 1
+ Parameter { type: "bool" }
+ }
+ Signal {
+ name: "parentChanged"
+ Parameter { type: "QQuickItem"; isPointer: true }
+ }
+ Signal {
+ name: "transformOriginChanged"
+ Parameter { type: "TransformOrigin" }
+ }
+ Signal {
+ name: "smoothChanged"
+ Parameter { type: "bool" }
+ }
+ Signal {
+ name: "antialiasingChanged"
+ Parameter { type: "bool" }
+ }
+ Signal {
+ name: "clipChanged"
+ Parameter { type: "bool" }
+ }
+ Signal {
+ name: "windowChanged"
+ revision: 1
+ Parameter { name: "window"; type: "QQuickWindow"; isPointer: true }
+ }
+ Method { name: "update" }
+ Method {
+ name: "grabToImage"
+ revision: 2
+ type: "bool"
+ Parameter { name: "callback"; type: "QJSValue" }
+ Parameter { name: "targetSize"; type: "QSize" }
+ }
+ Method {
+ name: "grabToImage"
+ revision: 2
+ type: "bool"
+ Parameter { name: "callback"; type: "QJSValue" }
+ }
+ Method {
+ name: "contains"
+ type: "bool"
+ Parameter { name: "point"; type: "QPointF" }
+ }
+ Method {
+ name: "mapToGlobal"
+ revision: 7
+ type: "QPointF"
+ Parameter { name: "point"; type: "QPointF" }
+ }
+ Method {
+ name: "mapFromGlobal"
+ revision: 7
+ type: "QPointF"
+ Parameter { name: "point"; type: "QPointF" }
+ }
+ Method {
+ name: "mapFromItem"
+ Parameter { type: "QQmlV4Function"; isPointer: true }
+ }
+ Method {
+ name: "mapToItem"
+ Parameter { type: "QQmlV4Function"; isPointer: true }
+ }
+ Method { name: "forceActiveFocus" }
+ Method {
+ name: "forceActiveFocus"
+ Parameter { name: "reason"; type: "Qt::FocusReason" }
+ }
+ Method {
+ name: "nextItemInFocusChain"
+ revision: 1
+ type: "QQuickItem*"
+ Parameter { name: "forward"; type: "bool" }
+ }
+ Method { name: "nextItemInFocusChain"; revision: 1; type: "QQuickItem*" }
+ Method {
+ name: "childAt"
+ type: "QQuickItem*"
+ Parameter { name: "x"; type: "double" }
+ Parameter { name: "y"; type: "double" }
+ }
+ }
+ Component {
+ name: "QQuickItemDelegate"
+ defaultProperty: "data"
+ prototype: "QQuickAbstractButton"
+ exports: ["QtQuick.Templates/ItemDelegate 2.0"]
+ exportMetaObjectRevisions: [0]
+ Property { name: "highlighted"; type: "bool" }
+ }
+ Component {
+ name: "QQuickLabel"
+ defaultProperty: "data"
+ prototype: "QQuickText"
+ exports: ["QtQuick.Templates/Label 2.0"]
+ exportMetaObjectRevisions: [0]
+ Property { name: "font"; type: "QFont" }
+ Property { name: "background"; type: "QQuickItem"; isPointer: true }
+ }
+ Component {
+ name: "QQuickMenu"
+ defaultProperty: "contentData"
+ prototype: "QQuickPopup"
+ exports: ["QtQuick.Templates/Menu 2.0"]
+ exportMetaObjectRevisions: [0]
+ Property { name: "contentModel"; type: "QVariant"; isReadonly: true }
+ Property { name: "contentData"; type: "QObject"; isList: true; isReadonly: true }
+ Property { name: "title"; type: "string" }
+ Method {
+ name: "itemAt"
+ type: "QQuickItem*"
+ Parameter { name: "index"; type: "int" }
+ }
+ Method {
+ name: "addItem"
+ Parameter { name: "item"; type: "QQuickItem"; isPointer: true }
+ }
+ Method {
+ name: "insertItem"
+ Parameter { name: "index"; type: "int" }
+ Parameter { name: "item"; type: "QQuickItem"; isPointer: true }
+ }
+ Method {
+ name: "moveItem"
+ Parameter { name: "from"; type: "int" }
+ Parameter { name: "to"; type: "int" }
+ }
+ Method {
+ name: "removeItem"
+ Parameter { name: "index"; type: "int" }
+ }
+ }
+ Component {
+ name: "QQuickMenuItem"
+ defaultProperty: "data"
+ prototype: "QQuickAbstractButton"
+ exports: ["QtQuick.Templates/MenuItem 2.0"]
+ exportMetaObjectRevisions: [0]
+ Property { name: "checkable"; type: "bool" }
+ Property { name: "highlighted"; type: "bool" }
+ Signal { name: "triggered" }
+ }
+ Component {
+ name: "QQuickOverlay"
+ defaultProperty: "data"
+ prototype: "QQuickItem"
+ Property { name: "modal"; type: "QQuickItem"; isPointer: true }
+ Property { name: "modeless"; type: "QQuickItem"; isPointer: true }
+ Signal { name: "pressed" }
+ Signal { name: "released" }
+ }
+ Component {
+ name: "QQuickPage"
+ defaultProperty: "contentData"
+ prototype: "QQuickControl"
+ exports: ["QtQuick.Templates/Page 2.0"]
+ exportMetaObjectRevisions: [0]
+ Property { name: "title"; type: "string" }
+ Property { name: "header"; type: "QQuickItem"; isPointer: true }
+ Property { name: "footer"; type: "QQuickItem"; isPointer: true }
+ Property { name: "contentData"; type: "QObject"; isList: true; isReadonly: true }
+ Property { name: "contentChildren"; type: "QQuickItem"; isList: true; isReadonly: true }
+ }
+ Component {
+ name: "QQuickPageIndicator"
+ defaultProperty: "data"
+ prototype: "QQuickControl"
+ exports: ["QtQuick.Templates/PageIndicator 2.0"]
+ exportMetaObjectRevisions: [0]
+ Property { name: "count"; type: "int" }
+ Property { name: "currentIndex"; type: "int" }
+ Property { name: "interactive"; type: "bool" }
+ Property { name: "delegate"; type: "QQmlComponent"; isPointer: true }
+ }
+ Component {
+ name: "QQuickPane"
+ defaultProperty: "contentData"
+ prototype: "QQuickControl"
+ exports: ["QtQuick.Templates/Pane 2.0"]
+ exportMetaObjectRevisions: [0]
+ Property { name: "contentWidth"; type: "double" }
+ Property { name: "contentHeight"; type: "double" }
+ Property { name: "contentData"; type: "QObject"; isList: true; isReadonly: true }
+ Property { name: "contentChildren"; type: "QQuickItem"; isList: true; isReadonly: true }
+ }
+ Component {
+ name: "QQuickPopup"
+ defaultProperty: "contentData"
+ prototype: "QObject"
+ exports: ["QtQuick.Templates/Popup 2.0"]
+ exportMetaObjectRevisions: [0]
+ Enum {
+ name: "ClosePolicy"
+ values: {
+ "NoAutoClose": 0,
+ "CloseOnPressOutside": 1,
+ "CloseOnPressOutsideParent": 2,
+ "CloseOnReleaseOutside": 4,
+ "CloseOnReleaseOutsideParent": 8,
+ "CloseOnEscape": 16
+ }
+ }
+ Enum {
+ name: "TransformOrigin"
+ values: {
+ "TopLeft": 0,
+ "Top": 1,
+ "TopRight": 2,
+ "Left": 3,
+ "Center": 4,
+ "Right": 5,
+ "BottomLeft": 6,
+ "Bottom": 7,
+ "BottomRight": 8
+ }
+ }
+ Property { name: "x"; type: "double" }
+ Property { name: "y"; type: "double" }
+ Property { name: "z"; type: "double" }
+ Property { name: "width"; type: "double" }
+ Property { name: "height"; type: "double" }
+ Property { name: "implicitWidth"; type: "double" }
+ Property { name: "implicitHeight"; type: "double" }
+ Property { name: "contentWidth"; type: "double" }
+ Property { name: "contentHeight"; type: "double" }
+ Property { name: "availableWidth"; type: "double"; isReadonly: true }
+ Property { name: "availableHeight"; type: "double"; isReadonly: true }
+ Property { name: "margins"; type: "double" }
+ Property { name: "topMargin"; type: "double" }
+ Property { name: "leftMargin"; type: "double" }
+ Property { name: "rightMargin"; type: "double" }
+ Property { name: "bottomMargin"; type: "double" }
+ Property { name: "padding"; type: "double" }
+ Property { name: "topPadding"; type: "double" }
+ Property { name: "leftPadding"; type: "double" }
+ Property { name: "rightPadding"; type: "double" }
+ Property { name: "bottomPadding"; type: "double" }
+ Property { name: "locale"; type: "QLocale" }
+ Property { name: "font"; type: "QFont" }
+ Property { name: "parent"; type: "QQuickItem"; isPointer: true }
+ Property { name: "background"; type: "QQuickItem"; isPointer: true }
+ Property { name: "contentItem"; type: "QQuickItem"; isPointer: true }
+ Property { name: "contentData"; type: "QObject"; isList: true; isReadonly: true }
+ Property { name: "contentChildren"; type: "QQuickItem"; isList: true; isReadonly: true }
+ Property { name: "clip"; type: "bool" }
+ Property { name: "focus"; type: "bool" }
+ Property { name: "activeFocus"; type: "bool"; isReadonly: true }
+ Property { name: "modal"; type: "bool" }
+ Property { name: "dim"; type: "bool" }
+ Property { name: "visible"; type: "bool" }
+ Property { name: "opacity"; type: "double" }
+ Property { name: "scale"; type: "double" }
+ Property { name: "closePolicy"; type: "ClosePolicy" }
+ Property { name: "transformOrigin"; type: "TransformOrigin" }
+ Property { name: "enter"; type: "QQuickTransition"; isPointer: true }
+ Property { name: "exit"; type: "QQuickTransition"; isPointer: true }
+ Signal {
+ name: "windowChanged"
+ Parameter { name: "window"; type: "QQuickWindow"; isPointer: true }
+ }
+ Signal { name: "aboutToShow" }
+ Signal { name: "aboutToHide" }
+ Signal { name: "opened" }
+ Signal { name: "closed" }
+ Method { name: "open" }
+ Method { name: "close" }
+ }
+ Component {
+ name: "QQuickProgressBar"
+ defaultProperty: "data"
+ prototype: "QQuickControl"
+ exports: ["QtQuick.Templates/ProgressBar 2.0"]
+ exportMetaObjectRevisions: [0]
+ Property { name: "from"; type: "double" }
+ Property { name: "to"; type: "double" }
+ Property { name: "value"; type: "double" }
+ Property { name: "position"; type: "double"; isReadonly: true }
+ Property { name: "visualPosition"; type: "double"; isReadonly: true }
+ Property { name: "indeterminate"; type: "bool" }
+ }
+ Component {
+ name: "QQuickRadioButton"
+ defaultProperty: "data"
+ prototype: "QQuickAbstractButton"
+ exports: ["QtQuick.Templates/RadioButton 2.0"]
+ exportMetaObjectRevisions: [0]
+ }
+ Component {
+ name: "QQuickRadioDelegate"
+ defaultProperty: "data"
+ prototype: "QQuickItemDelegate"
+ exports: ["QtQuick.Templates/RadioDelegate 2.0"]
+ exportMetaObjectRevisions: [0]
+ }
+ Component {
+ name: "QQuickRangeSlider"
+ defaultProperty: "data"
+ prototype: "QQuickControl"
+ exports: ["QtQuick.Templates/RangeSlider 2.0"]
+ exportMetaObjectRevisions: [0]
+ Enum {
+ name: "SnapMode"
+ values: {
+ "NoSnap": 0,
+ "SnapAlways": 1,
+ "SnapOnRelease": 2
+ }
+ }
+ Property { name: "from"; type: "double" }
+ Property { name: "to"; type: "double" }
+ Property { name: "first"; type: "QQuickRangeSliderNode"; isReadonly: true; isPointer: true }
+ Property { name: "second"; type: "QQuickRangeSliderNode"; isReadonly: true; isPointer: true }
+ Property { name: "stepSize"; type: "double" }
+ Property { name: "snapMode"; type: "SnapMode" }
+ Property { name: "orientation"; type: "Qt::Orientation" }
+ Method {
+ name: "setValues"
+ Parameter { name: "firstValue"; type: "double" }
+ Parameter { name: "secondValue"; type: "double" }
+ }
+ }
+ Component {
+ name: "QQuickRangeSliderNode"
+ prototype: "QObject"
+ Property { name: "value"; type: "double" }
+ Property { name: "position"; type: "double"; isReadonly: true }
+ Property { name: "visualPosition"; type: "double"; isReadonly: true }
+ Property { name: "handle"; type: "QQuickItem"; isPointer: true }
+ Property { name: "pressed"; type: "bool" }
+ Method { name: "increase" }
+ Method { name: "decrease" }
+ }
+ Component {
+ name: "QQuickRootItem"
+ defaultProperty: "data"
+ prototype: "QQuickItem"
+ Method {
+ name: "setWidth"
+ Parameter { name: "w"; type: "int" }
+ }
+ Method {
+ name: "setHeight"
+ Parameter { name: "h"; type: "int" }
+ }
+ }
+ Component {
+ name: "QQuickScrollBar"
+ defaultProperty: "data"
+ prototype: "QQuickControl"
+ exports: ["QtQuick.Templates/ScrollBar 2.0"]
+ exportMetaObjectRevisions: [0]
+ attachedType: "QQuickScrollBarAttached"
+ Property { name: "size"; type: "double" }
+ Property { name: "position"; type: "double" }
+ Property { name: "stepSize"; type: "double" }
+ Property { name: "active"; type: "bool" }
+ Property { name: "pressed"; type: "bool" }
+ Property { name: "orientation"; type: "Qt::Orientation" }
+ Method { name: "increase" }
+ Method { name: "decrease" }
+ Method {
+ name: "setSize"
+ Parameter { name: "size"; type: "double" }
+ }
+ Method {
+ name: "setPosition"
+ Parameter { name: "position"; type: "double" }
+ }
+ }
+ Component {
+ name: "QQuickScrollBarAttached"
+ prototype: "QObject"
+ Property { name: "horizontal"; type: "QQuickScrollBar"; isPointer: true }
+ Property { name: "vertical"; type: "QQuickScrollBar"; isPointer: true }
+ }
+ Component {
+ name: "QQuickScrollIndicator"
+ defaultProperty: "data"
+ prototype: "QQuickControl"
+ exports: ["QtQuick.Templates/ScrollIndicator 2.0"]
+ exportMetaObjectRevisions: [0]
+ attachedType: "QQuickScrollIndicatorAttached"
+ Property { name: "size"; type: "double" }
+ Property { name: "position"; type: "double" }
+ Property { name: "active"; type: "bool" }
+ Property { name: "orientation"; type: "Qt::Orientation" }
+ Method {
+ name: "setSize"
+ Parameter { name: "size"; type: "double" }
+ }
+ Method {
+ name: "setPosition"
+ Parameter { name: "position"; type: "double" }
+ }
+ }
+ Component {
+ name: "QQuickScrollIndicatorAttached"
+ prototype: "QObject"
+ Property { name: "horizontal"; type: "QQuickScrollIndicator"; isPointer: true }
+ Property { name: "vertical"; type: "QQuickScrollIndicator"; isPointer: true }
+ }
+ Component {
+ name: "QQuickSlider"
+ defaultProperty: "data"
+ prototype: "QQuickControl"
+ exports: ["QtQuick.Templates/Slider 2.0"]
+ exportMetaObjectRevisions: [0]
+ Enum {
+ name: "SnapMode"
+ values: {
+ "NoSnap": 0,
+ "SnapAlways": 1,
+ "SnapOnRelease": 2
+ }
+ }
+ Property { name: "from"; type: "double" }
+ Property { name: "to"; type: "double" }
+ Property { name: "value"; type: "double" }
+ Property { name: "position"; type: "double"; isReadonly: true }
+ Property { name: "visualPosition"; type: "double"; isReadonly: true }
+ Property { name: "stepSize"; type: "double" }
+ Property { name: "snapMode"; type: "SnapMode" }
+ Property { name: "pressed"; type: "bool" }
+ Property { name: "orientation"; type: "Qt::Orientation" }
+ Property { name: "handle"; type: "QQuickItem"; isPointer: true }
+ Method { name: "increase" }
+ Method { name: "decrease" }
+ }
+ Component {
+ name: "QQuickSpinBox"
+ defaultProperty: "data"
+ prototype: "QQuickControl"
+ exports: ["QtQuick.Templates/SpinBox 2.0"]
+ exportMetaObjectRevisions: [0]
+ Property { name: "from"; type: "int" }
+ Property { name: "to"; type: "int" }
+ Property { name: "value"; type: "int" }
+ Property { name: "stepSize"; type: "int" }
+ Property { name: "editable"; type: "bool" }
+ Property { name: "validator"; type: "QValidator"; isPointer: true }
+ Property { name: "textFromValue"; type: "QJSValue" }
+ Property { name: "valueFromText"; type: "QJSValue" }
+ Property { name: "up"; type: "QQuickSpinButton"; isReadonly: true; isPointer: true }
+ Property { name: "down"; type: "QQuickSpinButton"; isReadonly: true; isPointer: true }
+ Method { name: "increase" }
+ Method { name: "decrease" }
+ }
+ Component {
+ name: "QQuickSpinButton"
+ prototype: "QObject"
+ Property { name: "pressed"; type: "bool" }
+ Property { name: "indicator"; type: "QQuickItem"; isPointer: true }
+ }
+ Component {
+ name: "QQuickStackAttached"
+ prototype: "QObject"
+ Property { name: "index"; type: "int"; isReadonly: true }
+ Property { name: "view"; type: "QQuickStackView"; isReadonly: true; isPointer: true }
+ Property { name: "status"; type: "QQuickStackView::Status"; isReadonly: true }
+ }
+ Component {
+ name: "QQuickStackView"
+ defaultProperty: "data"
+ prototype: "QQuickControl"
+ exports: ["QtQuick.Templates/StackView 2.0"]
+ exportMetaObjectRevisions: [0]
+ attachedType: "QQuickStackAttached"
+ Enum {
+ name: "Status"
+ values: {
+ "Inactive": 0,
+ "Deactivating": 1,
+ "Activating": 2,
+ "Active": 3
+ }
+ }
+ Enum {
+ name: "LoadBehavior"
+ values: {
+ "DontLoad": 0,
+ "ForceLoad": 1
+ }
+ }
+ Enum {
+ name: "Operation"
+ values: {
+ "Transition": 0,
+ "Immediate": 1
+ }
+ }
+ Property { name: "busy"; type: "bool"; isReadonly: true }
+ Property { name: "depth"; type: "int"; isReadonly: true }
+ Property { name: "currentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true }
+ Property { name: "initialItem"; type: "QVariant" }
+ Property { name: "popEnter"; type: "QQuickTransition"; isPointer: true }
+ Property { name: "popExit"; type: "QQuickTransition"; isPointer: true }
+ Property { name: "pushEnter"; type: "QQuickTransition"; isPointer: true }
+ Property { name: "pushExit"; type: "QQuickTransition"; isPointer: true }
+ Property { name: "replaceEnter"; type: "QQuickTransition"; isPointer: true }
+ Property { name: "replaceExit"; type: "QQuickTransition"; isPointer: true }
+ Method { name: "clear" }
+ Method {
+ name: "get"
+ type: "QQuickItem*"
+ Parameter { name: "index"; type: "int" }
+ Parameter { name: "behavior"; type: "LoadBehavior" }
+ }
+ Method {
+ name: "get"
+ type: "QQuickItem*"
+ Parameter { name: "index"; type: "int" }
+ }
+ Method {
+ name: "find"
+ type: "QQuickItem*"
+ Parameter { name: "callback"; type: "QJSValue" }
+ Parameter { name: "behavior"; type: "LoadBehavior" }
+ }
+ Method {
+ name: "find"
+ type: "QQuickItem*"
+ Parameter { name: "callback"; type: "QJSValue" }
+ }
+ Method {
+ name: "push"
+ Parameter { name: "args"; type: "QQmlV4Function"; isPointer: true }
+ }
+ Method {
+ name: "pop"
+ Parameter { name: "args"; type: "QQmlV4Function"; isPointer: true }
+ }
+ Method {
+ name: "replace"
+ Parameter { name: "args"; type: "QQmlV4Function"; isPointer: true }
+ }
+ }
+ Component {
+ name: "QQuickSwipe"
+ prototype: "QObject"
+ Property { name: "position"; type: "double"; isReadonly: true }
+ Property { name: "complete"; type: "bool"; isReadonly: true }
+ Property { name: "left"; type: "QQmlComponent"; isPointer: true }
+ Property { name: "behind"; type: "QQmlComponent"; isPointer: true }
+ Property { name: "right"; type: "QQmlComponent"; isPointer: true }
+ Property { name: "leftItem"; type: "QQuickItem"; isReadonly: true; isPointer: true }
+ Property { name: "behindItem"; type: "QQuickItem"; isReadonly: true; isPointer: true }
+ Property { name: "rightItem"; type: "QQuickItem"; isReadonly: true; isPointer: true }
+ }
+ Component {
+ name: "QQuickSwipeDelegate"
+ defaultProperty: "data"
+ prototype: "QQuickItemDelegate"
+ exports: ["QtQuick.Templates/SwipeDelegate 2.0"]
+ exportMetaObjectRevisions: [0]
+ Property { name: "swipe"; type: "QQuickSwipe"; isReadonly: true; isPointer: true }
+ }
+ Component {
+ name: "QQuickSwipeView"
+ defaultProperty: "contentData"
+ prototype: "QQuickContainer"
+ exports: ["QtQuick.Templates/SwipeView 2.0"]
+ exportMetaObjectRevisions: [0]
+ attachedType: "QQuickSwipeViewAttached"
+ }
+ Component {
+ name: "QQuickSwipeViewAttached"
+ prototype: "QObject"
+ Property { name: "index"; type: "int"; isReadonly: true }
+ Property { name: "isCurrentItem"; type: "bool"; isReadonly: true }
+ Property { name: "view"; type: "QQuickSwipeView"; isReadonly: true; isPointer: true }
+ }
+ Component {
+ name: "QQuickSwitch"
+ defaultProperty: "data"
+ prototype: "QQuickAbstractButton"
+ exports: ["QtQuick.Templates/Switch 2.0"]
+ exportMetaObjectRevisions: [0]
+ Property { name: "position"; type: "double" }
+ Property { name: "visualPosition"; type: "double"; isReadonly: true }
+ }
+ Component {
+ name: "QQuickSwitchDelegate"
+ defaultProperty: "data"
+ prototype: "QQuickItemDelegate"
+ exports: ["QtQuick.Templates/SwitchDelegate 2.0"]
+ exportMetaObjectRevisions: [0]
+ Property { name: "position"; type: "double" }
+ Property { name: "visualPosition"; type: "double"; isReadonly: true }
+ }
+ Component {
+ name: "QQuickTabBar"
+ defaultProperty: "contentData"
+ prototype: "QQuickContainer"
+ exports: ["QtQuick.Templates/TabBar 2.0"]
+ exportMetaObjectRevisions: [0]
+ Enum {
+ name: "Position"
+ values: {
+ "Header": 0,
+ "Footer": 1
+ }
+ }
+ Property { name: "position"; type: "Position" }
+ }
+ Component {
+ name: "QQuickTabButton"
+ defaultProperty: "data"
+ prototype: "QQuickAbstractButton"
+ exports: ["QtQuick.Templates/TabButton 2.0"]
+ exportMetaObjectRevisions: [0]
+ }
+ Component {
+ name: "QQuickText"
+ defaultProperty: "data"
+ prototype: "QQuickImplicitSizeItem"
+ Enum {
+ name: "HAlignment"
+ values: {
+ "AlignLeft": 1,
+ "AlignRight": 2,
+ "AlignHCenter": 4,
+ "AlignJustify": 8
+ }
+ }
+ Enum {
+ name: "VAlignment"
+ values: {
+ "AlignTop": 32,
+ "AlignBottom": 64,
+ "AlignVCenter": 128
+ }
+ }
+ Enum {
+ name: "TextStyle"
+ values: {
+ "Normal": 0,
+ "Outline": 1,
+ "Raised": 2,
+ "Sunken": 3
+ }
+ }
+ Enum {
+ name: "TextFormat"
+ values: {
+ "PlainText": 0,
+ "RichText": 1,
+ "AutoText": 2,
+ "StyledText": 4
+ }
+ }
+ Enum {
+ name: "TextElideMode"
+ values: {
+ "ElideLeft": 0,
+ "ElideRight": 1,
+ "ElideMiddle": 2,
+ "ElideNone": 3
+ }
+ }
+ Enum {
+ name: "WrapMode"
+ values: {
+ "NoWrap": 0,
+ "WordWrap": 1,
+ "WrapAnywhere": 3,
+ "WrapAtWordBoundaryOrAnywhere": 4,
+ "Wrap": 4
+ }
+ }
+ Enum {
+ name: "RenderType"
+ values: {
+ "QtRendering": 0,
+ "NativeRendering": 1
+ }
+ }
+ Enum {
+ name: "LineHeightMode"
+ values: {
+ "ProportionalHeight": 0,
+ "FixedHeight": 1
+ }
+ }
+ Enum {
+ name: "FontSizeMode"
+ values: {
+ "FixedSize": 0,
+ "HorizontalFit": 1,
+ "VerticalFit": 2,
+ "Fit": 3
+ }
+ }
+ Property { name: "text"; type: "string" }
+ Property { name: "font"; type: "QFont" }
+ Property { name: "color"; type: "QColor" }
+ Property { name: "linkColor"; type: "QColor" }
+ Property { name: "style"; type: "TextStyle" }
+ Property { name: "styleColor"; type: "QColor" }
+ Property { name: "horizontalAlignment"; type: "HAlignment" }
+ Property { name: "effectiveHorizontalAlignment"; type: "HAlignment"; isReadonly: true }
+ Property { name: "verticalAlignment"; type: "VAlignment" }
+ Property { name: "wrapMode"; type: "WrapMode" }
+ Property { name: "lineCount"; type: "int"; isReadonly: true }
+ Property { name: "truncated"; type: "bool"; isReadonly: true }
+ Property { name: "maximumLineCount"; type: "int" }
+ Property { name: "textFormat"; type: "TextFormat" }
+ Property { name: "elide"; type: "TextElideMode" }
+ Property { name: "contentWidth"; type: "double"; isReadonly: true }
+ Property { name: "contentHeight"; type: "double"; isReadonly: true }
+ Property { name: "paintedWidth"; type: "double"; isReadonly: true }
+ Property { name: "paintedHeight"; type: "double"; isReadonly: true }
+ Property { name: "lineHeight"; type: "double" }
+ Property { name: "lineHeightMode"; type: "LineHeightMode" }
+ Property { name: "baseUrl"; type: "QUrl" }
+ Property { name: "minimumPixelSize"; type: "int" }
+ Property { name: "minimumPointSize"; type: "int" }
+ Property { name: "fontSizeMode"; type: "FontSizeMode" }
+ Property { name: "renderType"; type: "RenderType" }
+ Property { name: "hoveredLink"; revision: 2; type: "string"; isReadonly: true }
+ Property { name: "padding"; revision: 6; type: "double" }
+ Property { name: "topPadding"; revision: 6; type: "double" }
+ Property { name: "leftPadding"; revision: 6; type: "double" }
+ Property { name: "rightPadding"; revision: 6; type: "double" }
+ Property { name: "bottomPadding"; revision: 6; type: "double" }
+ Signal {
+ name: "textChanged"
+ Parameter { name: "text"; type: "string" }
+ }
+ Signal {
+ name: "linkActivated"
+ Parameter { name: "link"; type: "string" }
+ }
+ Signal {
+ name: "linkHovered"
+ revision: 2
+ Parameter { name: "link"; type: "string" }
+ }
+ Signal {
+ name: "fontChanged"
+ Parameter { name: "font"; type: "QFont" }
+ }
+ Signal {
+ name: "styleChanged"
+ Parameter { name: "style"; type: "QQuickText::TextStyle" }
+ }
+ Signal {
+ name: "horizontalAlignmentChanged"
+ Parameter { name: "alignment"; type: "QQuickText::HAlignment" }
+ }
+ Signal {
+ name: "verticalAlignmentChanged"
+ Parameter { name: "alignment"; type: "QQuickText::VAlignment" }
+ }
+ Signal {
+ name: "textFormatChanged"
+ Parameter { name: "textFormat"; type: "QQuickText::TextFormat" }
+ }
+ Signal {
+ name: "elideModeChanged"
+ Parameter { name: "mode"; type: "QQuickText::TextElideMode" }
+ }
+ Signal { name: "contentSizeChanged" }
+ Signal {
+ name: "lineHeightChanged"
+ Parameter { name: "lineHeight"; type: "double" }
+ }
+ Signal {
+ name: "lineHeightModeChanged"
+ Parameter { name: "mode"; type: "LineHeightMode" }
+ }
+ Signal {
+ name: "lineLaidOut"
+ Parameter { name: "line"; type: "QQuickTextLine"; isPointer: true }
+ }
+ Signal { name: "paddingChanged"; revision: 6 }
+ Signal { name: "topPaddingChanged"; revision: 6 }
+ Signal { name: "leftPaddingChanged"; revision: 6 }
+ Signal { name: "rightPaddingChanged"; revision: 6 }
+ Signal { name: "bottomPaddingChanged"; revision: 6 }
+ Method { name: "doLayout" }
+ Method {
+ name: "linkAt"
+ revision: 3
+ type: "string"
+ Parameter { name: "x"; type: "double" }
+ Parameter { name: "y"; type: "double" }
+ }
+ }
+ Component {
+ name: "QQuickTextArea"
+ defaultProperty: "data"
+ prototype: "QQuickTextEdit"
+ exports: ["QtQuick.Templates/TextArea 2.0"]
+ exportMetaObjectRevisions: [0]
+ attachedType: "QQuickTextAreaAttached"
+ Property { name: "font"; type: "QFont" }
+ Property { name: "implicitWidth"; type: "double" }
+ Property { name: "implicitHeight"; type: "double" }
+ Property { name: "background"; type: "QQuickItem"; isPointer: true }
+ Property { name: "placeholderText"; type: "string" }
+ Property { name: "focusReason"; type: "Qt::FocusReason" }
+ Signal { name: "implicitWidthChanged3" }
+ Signal { name: "implicitHeightChanged3" }
+ Signal {
+ name: "pressAndHold"
+ Parameter { name: "event"; type: "QQuickMouseEvent"; isPointer: true }
+ }
+ }
+ Component {
+ name: "QQuickTextAreaAttached"
+ prototype: "QObject"
+ Property { name: "flickable"; type: "QQuickTextArea"; isPointer: true }
+ }
+ Component {
+ name: "QQuickTextEdit"
+ defaultProperty: "data"
+ prototype: "QQuickImplicitSizeItem"
+ Enum {
+ name: "HAlignment"
+ values: {
+ "AlignLeft": 1,
+ "AlignRight": 2,
+ "AlignHCenter": 4,
+ "AlignJustify": 8
+ }
+ }
+ Enum {
+ name: "VAlignment"
+ values: {
+ "AlignTop": 32,
+ "AlignBottom": 64,
+ "AlignVCenter": 128
+ }
+ }
+ Enum {
+ name: "TextFormat"
+ values: {
+ "PlainText": 0,
+ "RichText": 1,
+ "AutoText": 2
+ }
+ }
+ Enum {
+ name: "WrapMode"
+ values: {
+ "NoWrap": 0,
+ "WordWrap": 1,
+ "WrapAnywhere": 3,
+ "WrapAtWordBoundaryOrAnywhere": 4,
+ "Wrap": 4
+ }
+ }
+ Enum {
+ name: "SelectionMode"
+ values: {
+ "SelectCharacters": 0,
+ "SelectWords": 1
+ }
+ }
+ Enum {
+ name: "RenderType"
+ values: {
+ "QtRendering": 0,
+ "NativeRendering": 1
+ }
+ }
+ Property { name: "text"; type: "string" }
+ Property { name: "color"; type: "QColor" }
+ Property { name: "selectionColor"; type: "QColor" }
+ Property { name: "selectedTextColor"; type: "QColor" }
+ Property { name: "font"; type: "QFont" }
+ Property { name: "horizontalAlignment"; type: "HAlignment" }
+ Property { name: "effectiveHorizontalAlignment"; type: "HAlignment"; isReadonly: true }
+ Property { name: "verticalAlignment"; type: "VAlignment" }
+ Property { name: "wrapMode"; type: "WrapMode" }
+ Property { name: "lineCount"; type: "int"; isReadonly: true }
+ Property { name: "length"; type: "int"; isReadonly: true }
+ Property { name: "contentWidth"; type: "double"; isReadonly: true }
+ Property { name: "contentHeight"; type: "double"; isReadonly: true }
+ Property { name: "paintedWidth"; type: "double"; isReadonly: true }
+ Property { name: "paintedHeight"; type: "double"; isReadonly: true }
+ Property { name: "textFormat"; type: "TextFormat" }
+ Property { name: "readOnly"; type: "bool" }
+ Property { name: "cursorVisible"; type: "bool" }
+ Property { name: "cursorPosition"; type: "int" }
+ Property { name: "cursorRectangle"; type: "QRectF"; isReadonly: true }
+ Property { name: "cursorDelegate"; type: "QQmlComponent"; isPointer: true }
+ Property { name: "selectionStart"; type: "int"; isReadonly: true }
+ Property { name: "selectionEnd"; type: "int"; isReadonly: true }
+ Property { name: "selectedText"; type: "string"; isReadonly: true }
+ Property { name: "activeFocusOnPress"; type: "bool" }
+ Property { name: "persistentSelection"; type: "bool" }
+ Property { name: "textMargin"; type: "double" }
+ Property { name: "inputMethodHints"; type: "Qt::InputMethodHints" }
+ Property { name: "selectByKeyboard"; revision: 1; type: "bool" }
+ Property { name: "selectByMouse"; type: "bool" }
+ Property { name: "mouseSelectionMode"; type: "SelectionMode" }
+ Property { name: "canPaste"; type: "bool"; isReadonly: true }
+ Property { name: "canUndo"; type: "bool"; isReadonly: true }
+ Property { name: "canRedo"; type: "bool"; isReadonly: true }
+ Property { name: "inputMethodComposing"; type: "bool"; isReadonly: true }
+ Property { name: "baseUrl"; type: "QUrl" }
+ Property { name: "renderType"; type: "RenderType" }
+ Property {
+ name: "textDocument"
+ revision: 1
+ type: "QQuickTextDocument"
+ isReadonly: true
+ isPointer: true
+ }
+ Property { name: "hoveredLink"; revision: 2; type: "string"; isReadonly: true }
+ Property { name: "padding"; revision: 6; type: "double" }
+ Property { name: "topPadding"; revision: 6; type: "double" }
+ Property { name: "leftPadding"; revision: 6; type: "double" }
+ Property { name: "rightPadding"; revision: 6; type: "double" }
+ Property { name: "bottomPadding"; revision: 6; type: "double" }
+ Property { name: "preeditText"; revision: 7; type: "string"; isReadonly: true }
+ Signal { name: "preeditTextChanged"; revision: 7 }
+ Signal { name: "contentSizeChanged" }
+ Signal {
+ name: "colorChanged"
+ Parameter { name: "color"; type: "QColor" }
+ }
+ Signal {
+ name: "selectionColorChanged"
+ Parameter { name: "color"; type: "QColor" }
+ }
+ Signal {
+ name: "selectedTextColorChanged"
+ Parameter { name: "color"; type: "QColor" }
+ }
+ Signal {
+ name: "fontChanged"
+ Parameter { name: "font"; type: "QFont" }
+ }
+ Signal {
+ name: "horizontalAlignmentChanged"
+ Parameter { name: "alignment"; type: "QQuickTextEdit::HAlignment" }
+ }
+ Signal {
+ name: "verticalAlignmentChanged"
+ Parameter { name: "alignment"; type: "QQuickTextEdit::VAlignment" }
+ }
+ Signal {
+ name: "textFormatChanged"
+ Parameter { name: "textFormat"; type: "QQuickTextEdit::TextFormat" }
+ }
+ Signal {
+ name: "readOnlyChanged"
+ Parameter { name: "isReadOnly"; type: "bool" }
+ }
+ Signal {
+ name: "cursorVisibleChanged"
+ Parameter { name: "isCursorVisible"; type: "bool" }
+ }
+ Signal {
+ name: "activeFocusOnPressChanged"
+ Parameter { name: "activeFocusOnPressed"; type: "bool" }
+ }
+ Signal {
+ name: "persistentSelectionChanged"
+ Parameter { name: "isPersistentSelection"; type: "bool" }
+ }
+ Signal {
+ name: "textMarginChanged"
+ Parameter { name: "textMargin"; type: "double" }
+ }
+ Signal {
+ name: "selectByKeyboardChanged"
+ revision: 1
+ Parameter { name: "selectByKeyboard"; type: "bool" }
+ }
+ Signal {
+ name: "selectByMouseChanged"
+ Parameter { name: "selectByMouse"; type: "bool" }
+ }
+ Signal {
+ name: "mouseSelectionModeChanged"
+ Parameter { name: "mode"; type: "QQuickTextEdit::SelectionMode" }
+ }
+ Signal {
+ name: "linkActivated"
+ Parameter { name: "link"; type: "string" }
+ }
+ Signal {
+ name: "linkHovered"
+ revision: 2
+ Parameter { name: "link"; type: "string" }
+ }
+ Signal { name: "editingFinished"; revision: 6 }
+ Signal { name: "paddingChanged"; revision: 6 }
+ Signal { name: "topPaddingChanged"; revision: 6 }
+ Signal { name: "leftPaddingChanged"; revision: 6 }
+ Signal { name: "rightPaddingChanged"; revision: 6 }
+ Signal { name: "bottomPaddingChanged"; revision: 6 }
+ Method { name: "selectAll" }
+ Method { name: "selectWord" }
+ Method {
+ name: "select"
+ Parameter { name: "start"; type: "int" }
+ Parameter { name: "end"; type: "int" }
+ }
+ Method { name: "deselect" }
+ Method {
+ name: "isRightToLeft"
+ type: "bool"
+ Parameter { name: "start"; type: "int" }
+ Parameter { name: "end"; type: "int" }
+ }
+ Method { name: "cut" }
+ Method { name: "copy" }
+ Method { name: "paste" }
+ Method { name: "undo" }
+ Method { name: "redo" }
+ Method {
+ name: "insert"
+ Parameter { name: "position"; type: "int" }
+ Parameter { name: "text"; type: "string" }
+ }
+ Method {
+ name: "remove"
+ Parameter { name: "start"; type: "int" }
+ Parameter { name: "end"; type: "int" }
+ }
+ Method {
+ name: "append"
+ revision: 2
+ Parameter { name: "text"; type: "string" }
+ }
+ Method { name: "clear"; revision: 7 }
+ Method {
+ name: "inputMethodQuery"
+ revision: 4
+ type: "QVariant"
+ Parameter { name: "query"; type: "Qt::InputMethodQuery" }
+ Parameter { name: "argument"; type: "QVariant" }
+ }
+ Method {
+ name: "positionToRectangle"
+ type: "QRectF"
+ Parameter { type: "int" }
+ }
+ Method {
+ name: "positionAt"
+ type: "int"
+ Parameter { name: "x"; type: "double" }
+ Parameter { name: "y"; type: "double" }
+ }
+ Method {
+ name: "moveCursorSelection"
+ Parameter { name: "pos"; type: "int" }
+ }
+ Method {
+ name: "moveCursorSelection"
+ Parameter { name: "pos"; type: "int" }
+ Parameter { name: "mode"; type: "SelectionMode" }
+ }
+ Method {
+ name: "getText"
+ type: "string"
+ Parameter { name: "start"; type: "int" }
+ Parameter { name: "end"; type: "int" }
+ }
+ Method {
+ name: "getFormattedText"
+ type: "string"
+ Parameter { name: "start"; type: "int" }
+ Parameter { name: "end"; type: "int" }
+ }
+ Method {
+ name: "linkAt"
+ revision: 3
+ type: "string"
+ Parameter { name: "x"; type: "double" }
+ Parameter { name: "y"; type: "double" }
+ }
+ }
+ Component {
+ name: "QQuickTextField"
+ defaultProperty: "data"
+ prototype: "QQuickTextInput"
+ exports: ["QtQuick.Templates/TextField 2.0"]
+ exportMetaObjectRevisions: [0]
+ Property { name: "font"; type: "QFont" }
+ Property { name: "implicitWidth"; type: "double" }
+ Property { name: "implicitHeight"; type: "double" }
+ Property { name: "background"; type: "QQuickItem"; isPointer: true }
+ Property { name: "placeholderText"; type: "string" }
+ Property { name: "focusReason"; type: "Qt::FocusReason" }
+ Signal { name: "implicitWidthChanged3" }
+ Signal { name: "implicitHeightChanged3" }
+ Signal {
+ name: "pressAndHold"
+ Parameter { name: "mouse"; type: "QQuickMouseEvent"; isPointer: true }
+ }
+ }
+ Component {
+ name: "QQuickTextInput"
+ defaultProperty: "data"
+ prototype: "QQuickImplicitSizeItem"
+ Enum {
+ name: "EchoMode"
+ values: {
+ "Normal": 0,
+ "NoEcho": 1,
+ "Password": 2,
+ "PasswordEchoOnEdit": 3
+ }
+ }
+ Enum {
+ name: "HAlignment"
+ values: {
+ "AlignLeft": 1,
+ "AlignRight": 2,
+ "AlignHCenter": 4
+ }
+ }
+ Enum {
+ name: "VAlignment"
+ values: {
+ "AlignTop": 32,
+ "AlignBottom": 64,
+ "AlignVCenter": 128
+ }
+ }
+ Enum {
+ name: "WrapMode"
+ values: {
+ "NoWrap": 0,
+ "WordWrap": 1,
+ "WrapAnywhere": 3,
+ "WrapAtWordBoundaryOrAnywhere": 4,
+ "Wrap": 4
+ }
+ }
+ Enum {
+ name: "SelectionMode"
+ values: {
+ "SelectCharacters": 0,
+ "SelectWords": 1
+ }
+ }
+ Enum {
+ name: "CursorPosition"
+ values: {
+ "CursorBetweenCharacters": 0,
+ "CursorOnCharacter": 1
+ }
+ }
+ Enum {
+ name: "RenderType"
+ values: {
+ "QtRendering": 0,
+ "NativeRendering": 1
+ }
+ }
+ Property { name: "text"; type: "string" }
+ Property { name: "length"; type: "int"; isReadonly: true }
+ Property { name: "color"; type: "QColor" }
+ Property { name: "selectionColor"; type: "QColor" }
+ Property { name: "selectedTextColor"; type: "QColor" }
+ Property { name: "font"; type: "QFont" }
+ Property { name: "horizontalAlignment"; type: "HAlignment" }
+ Property { name: "effectiveHorizontalAlignment"; type: "HAlignment"; isReadonly: true }
+ Property { name: "verticalAlignment"; type: "VAlignment" }
+ Property { name: "wrapMode"; type: "WrapMode" }
+ Property { name: "readOnly"; type: "bool" }
+ Property { name: "cursorVisible"; type: "bool" }
+ Property { name: "cursorPosition"; type: "int" }
+ Property { name: "cursorRectangle"; type: "QRectF"; isReadonly: true }
+ Property { name: "cursorDelegate"; type: "QQmlComponent"; isPointer: true }
+ Property { name: "selectionStart"; type: "int"; isReadonly: true }
+ Property { name: "selectionEnd"; type: "int"; isReadonly: true }
+ Property { name: "selectedText"; type: "string"; isReadonly: true }
+ Property { name: "maximumLength"; type: "int" }
+ Property { name: "validator"; type: "QValidator"; isPointer: true }
+ Property { name: "inputMask"; type: "string" }
+ Property { name: "inputMethodHints"; type: "Qt::InputMethodHints" }
+ Property { name: "acceptableInput"; type: "bool"; isReadonly: true }
+ Property { name: "echoMode"; type: "EchoMode" }
+ Property { name: "activeFocusOnPress"; type: "bool" }
+ Property { name: "passwordCharacter"; type: "string" }
+ Property { name: "passwordMaskDelay"; revision: 3; type: "int" }
+ Property { name: "displayText"; type: "string"; isReadonly: true }
+ Property { name: "preeditText"; revision: 7; type: "string"; isReadonly: true }
+ Property { name: "autoScroll"; type: "bool" }
+ Property { name: "selectByMouse"; type: "bool" }
+ Property { name: "mouseSelectionMode"; type: "SelectionMode" }
+ Property { name: "persistentSelection"; type: "bool" }
+ Property { name: "canPaste"; type: "bool"; isReadonly: true }
+ Property { name: "canUndo"; type: "bool"; isReadonly: true }
+ Property { name: "canRedo"; type: "bool"; isReadonly: true }
+ Property { name: "inputMethodComposing"; type: "bool"; isReadonly: true }
+ Property { name: "contentWidth"; type: "double"; isReadonly: true }
+ Property { name: "contentHeight"; type: "double"; isReadonly: true }
+ Property { name: "renderType"; type: "RenderType" }
+ Property { name: "padding"; revision: 6; type: "double" }
+ Property { name: "topPadding"; revision: 6; type: "double" }
+ Property { name: "leftPadding"; revision: 6; type: "double" }
+ Property { name: "rightPadding"; revision: 6; type: "double" }
+ Property { name: "bottomPadding"; revision: 6; type: "double" }
+ Signal { name: "accepted" }
+ Signal { name: "editingFinished"; revision: 2 }
+ Signal {
+ name: "fontChanged"
+ Parameter { name: "font"; type: "QFont" }
+ }
+ Signal {
+ name: "horizontalAlignmentChanged"
+ Parameter { name: "alignment"; type: "QQuickTextInput::HAlignment" }
+ }
+ Signal {
+ name: "verticalAlignmentChanged"
+ Parameter { name: "alignment"; type: "QQuickTextInput::VAlignment" }
+ }
+ Signal {
+ name: "readOnlyChanged"
+ Parameter { name: "isReadOnly"; type: "bool" }
+ }
+ Signal {
+ name: "cursorVisibleChanged"
+ Parameter { name: "isCursorVisible"; type: "bool" }
+ }
+ Signal {
+ name: "maximumLengthChanged"
+ Parameter { name: "maximumLength"; type: "int" }
+ }
+ Signal {
+ name: "inputMaskChanged"
+ Parameter { name: "inputMask"; type: "string" }
+ }
+ Signal {
+ name: "echoModeChanged"
+ Parameter { name: "echoMode"; type: "QQuickTextInput::EchoMode" }
+ }
+ Signal {
+ name: "passwordMaskDelayChanged"
+ revision: 3
+ Parameter { name: "delay"; type: "int" }
+ }
+ Signal { name: "preeditTextChanged"; revision: 7 }
+ Signal {
+ name: "activeFocusOnPressChanged"
+ Parameter { name: "activeFocusOnPress"; type: "bool" }
+ }
+ Signal {
+ name: "autoScrollChanged"
+ Parameter { name: "autoScroll"; type: "bool" }
+ }
+ Signal {
+ name: "selectByMouseChanged"
+ Parameter { name: "selectByMouse"; type: "bool" }
+ }
+ Signal {
+ name: "mouseSelectionModeChanged"
+ Parameter { name: "mode"; type: "QQuickTextInput::SelectionMode" }
+ }
+ Signal { name: "contentSizeChanged" }
+ Signal { name: "paddingChanged"; revision: 6 }
+ Signal { name: "topPaddingChanged"; revision: 6 }
+ Signal { name: "leftPaddingChanged"; revision: 6 }
+ Signal { name: "rightPaddingChanged"; revision: 6 }
+ Signal { name: "bottomPaddingChanged"; revision: 6 }
+ Method { name: "selectAll" }
+ Method { name: "selectWord" }
+ Method {
+ name: "select"
+ Parameter { name: "start"; type: "int" }
+ Parameter { name: "end"; type: "int" }
+ }
+ Method { name: "deselect" }
+ Method {
+ name: "isRightToLeft"
+ type: "bool"
+ Parameter { name: "start"; type: "int" }
+ Parameter { name: "end"; type: "int" }
+ }
+ Method { name: "cut" }
+ Method { name: "copy" }
+ Method { name: "paste" }
+ Method { name: "undo" }
+ Method { name: "redo" }
+ Method {
+ name: "insert"
+ Parameter { name: "position"; type: "int" }
+ Parameter { name: "text"; type: "string" }
+ }
+ Method {
+ name: "remove"
+ Parameter { name: "start"; type: "int" }
+ Parameter { name: "end"; type: "int" }
+ }
+ Method {
+ name: "ensureVisible"
+ revision: 3
+ Parameter { name: "position"; type: "int" }
+ }
+ Method { name: "clear"; revision: 7 }
+ Method {
+ name: "positionAt"
+ Parameter { name: "args"; type: "QQmlV4Function"; isPointer: true }
+ }
+ Method {
+ name: "positionToRectangle"
+ type: "QRectF"
+ Parameter { name: "pos"; type: "int" }
+ }
+ Method {
+ name: "moveCursorSelection"
+ Parameter { name: "pos"; type: "int" }
+ }
+ Method {
+ name: "moveCursorSelection"
+ Parameter { name: "pos"; type: "int" }
+ Parameter { name: "mode"; type: "SelectionMode" }
+ }
+ Method {
+ name: "inputMethodQuery"
+ revision: 3
+ type: "QVariant"
+ Parameter { name: "query"; type: "Qt::InputMethodQuery" }
+ Parameter { name: "argument"; type: "QVariant" }
+ }
+ Method {
+ name: "getText"
+ type: "string"
+ Parameter { name: "start"; type: "int" }
+ Parameter { name: "end"; type: "int" }
+ }
+ }
+ Component {
+ name: "QQuickToolBar"
+ defaultProperty: "contentData"
+ prototype: "QQuickFrame"
+ exports: ["QtQuick.Templates/ToolBar 2.0"]
+ exportMetaObjectRevisions: [0]
+ Enum {
+ name: "Position"
+ values: {
+ "Header": 0,
+ "Footer": 1
+ }
+ }
+ Property { name: "position"; type: "Position" }
+ }
+ Component {
+ name: "QQuickToolButton"
+ defaultProperty: "data"
+ prototype: "QQuickButton"
+ exports: ["QtQuick.Templates/ToolButton 2.0"]
+ exportMetaObjectRevisions: [0]
+ }
+ Component {
+ name: "QQuickToolTip"
+ defaultProperty: "contentData"
+ prototype: "QQuickPopup"
+ exports: ["QtQuick.Templates/ToolTip 2.0"]
+ exportMetaObjectRevisions: [0]
+ attachedType: "QQuickToolTipAttached"
+ Property { name: "delay"; type: "int" }
+ Property { name: "timeout"; type: "int" }
+ Property { name: "text"; type: "string" }
+ Method { name: "open" }
+ Method { name: "close" }
+ }
+ Component {
+ name: "QQuickToolTipAttached"
+ prototype: "QObject"
+ Property { name: "text"; type: "string" }
+ Property { name: "delay"; type: "int" }
+ Property { name: "timeout"; type: "int" }
+ Property { name: "visible"; type: "bool" }
+ Property { name: "toolTip"; type: "QQuickToolTip"; isReadonly: true; isPointer: true }
+ Method {
+ name: "show"
+ Parameter { name: "text"; type: "string" }
+ Parameter { name: "ms"; type: "int" }
+ }
+ Method {
+ name: "show"
+ Parameter { name: "text"; type: "string" }
+ }
+ Method { name: "hide" }
+ }
+ Component {
+ name: "QQuickTumbler"
+ defaultProperty: "data"
+ prototype: "QQuickControl"
+ exports: ["QtQuick.Templates/Tumbler 2.0"]
+ exportMetaObjectRevisions: [0]
+ attachedType: "QQuickTumblerAttached"
+ Property { name: "model"; type: "QVariant" }
+ Property { name: "count"; type: "int"; isReadonly: true }
+ Property { name: "currentIndex"; type: "int" }
+ Property { name: "currentItem"; type: "QQuickItem"; isReadonly: true; isPointer: true }
+ Property { name: "delegate"; type: "QQmlComponent"; isPointer: true }
+ Property { name: "visibleItemCount"; type: "int" }
+ }
+ Component {
+ name: "QQuickTumblerAttached"
+ prototype: "QObject"
+ Property { name: "tumbler"; type: "QQuickTumbler"; isReadonly: true; isPointer: true }
+ Property { name: "displacement"; type: "double"; isReadonly: true }
+ }
}
diff --git a/src/imports/controls/universal/SpinBox.qml b/src/imports/controls/universal/SpinBox.qml
index 49fa6954..4654aa01 100644
--- a/src/imports/controls/universal/SpinBox.qml
+++ b/src/imports/controls/universal/SpinBox.qml
@@ -106,8 +106,8 @@ T.SpinBox {
x: (parent.width - width) / 2
y: (parent.height - height) / 2
source: "image://universal/" + (control.mirrored ? "left" : "right") + "arrow/"
- + (!control.enabled ? control.Universal.chromeDisabledLowColor :
- control.activeFocus ? control.Universal.chromeBlackHighColor : control.Universal.baseHighColor)
+ + (!enabled ? control.Universal.chromeDisabledLowColor :
+ control.activeFocus ? control.Universal.chromeBlackHighColor : control.Universal.baseHighColor)
sourceSize.width: width
sourceSize.height: height
}
@@ -134,8 +134,8 @@ T.SpinBox {
x: (parent.width - width) / 2
y: (parent.height - height) / 2
source: "image://universal/" + (control.mirrored ? "right" : "left") + "arrow/"
- + (!control.enabled ? control.Universal.chromeDisabledLowColor :
- control.activeFocus ? control.Universal.chromeBlackHighColor : control.Universal.baseHighColor)
+ + (!enabled ? control.Universal.chromeDisabledLowColor :
+ control.activeFocus ? control.Universal.chromeBlackHighColor : control.Universal.baseHighColor)
sourceSize.width: width
sourceSize.height: height
}