From f0ec4fa2b49948561607dcdf52207ab7a3b2b8d5 Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Mon, 13 May 2024 15:53:46 +0800 Subject: Doc: import Basic style in customization snippets This ensures that the user won't inadvertently base the customizations on top of the native styles, but also saves adding the extra code that using QtQuick.Templates would require. The first sentence of the section already states that the Basic style is in use. Fixes: QTBUG-125228 Change-Id: I191f1664ab0dcf190e4825b98e7ec12f00de307f Reviewed-by: Richard Moe Gustavsen (cherry picked from commit e4577eb6bb9308d2b84bfe66216333b001ac670b) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 82a2eedcd4c78da0e918fca38158df381ad4763a) --- src/quickcontrols/doc/snippets/qtquickcontrols-busyindicator-custom.qml | 2 +- src/quickcontrols/doc/snippets/qtquickcontrols-button-custom.qml | 2 +- src/quickcontrols/doc/snippets/qtquickcontrols-checkbox-custom.qml | 2 +- src/quickcontrols/doc/snippets/qtquickcontrols-checkdelegate-custom.qml | 2 +- src/quickcontrols/doc/snippets/qtquickcontrols-combobox-custom.qml | 2 +- src/quickcontrols/doc/snippets/qtquickcontrols-delaybutton-custom.qml | 2 +- src/quickcontrols/doc/snippets/qtquickcontrols-dial-custom.qml | 2 +- src/quickcontrols/doc/snippets/qtquickcontrols-frame-custom.qml | 2 +- src/quickcontrols/doc/snippets/qtquickcontrols-groupbox-custom.qml | 2 +- src/quickcontrols/doc/snippets/qtquickcontrols-itemdelegate-custom.qml | 2 +- src/quickcontrols/doc/snippets/qtquickcontrols-label-custom.qml | 2 +- src/quickcontrols/doc/snippets/qtquickcontrols-menu-custom.qml | 2 +- src/quickcontrols/doc/snippets/qtquickcontrols-menubar-custom.qml | 2 +- src/quickcontrols/doc/snippets/qtquickcontrols-menuseparator-custom.qml | 2 +- src/quickcontrols/doc/snippets/qtquickcontrols-pageindicator-custom.qml | 2 +- src/quickcontrols/doc/snippets/qtquickcontrols-pane-custom.qml | 2 +- src/quickcontrols/doc/snippets/qtquickcontrols-popup-custom.qml | 2 +- src/quickcontrols/doc/snippets/qtquickcontrols-progressbar-custom.qml | 2 +- src/quickcontrols/doc/snippets/qtquickcontrols-radiobutton-custom.qml | 2 +- src/quickcontrols/doc/snippets/qtquickcontrols-radiodelegate-custom.qml | 2 +- src/quickcontrols/doc/snippets/qtquickcontrols-rangeslider-custom.qml | 2 +- src/quickcontrols/doc/snippets/qtquickcontrols-scrollbar-custom.qml | 2 +- .../doc/snippets/qtquickcontrols-scrollindicator-custom.qml | 2 +- src/quickcontrols/doc/snippets/qtquickcontrols-scrollview-custom.qml | 2 +- src/quickcontrols/doc/snippets/qtquickcontrols-slider-custom.qml | 2 +- src/quickcontrols/doc/snippets/qtquickcontrols-spinbox-custom.qml | 2 +- src/quickcontrols/doc/snippets/qtquickcontrols-splitview-custom.qml | 2 +- src/quickcontrols/doc/snippets/qtquickcontrols-stackview-custom.qml | 2 +- src/quickcontrols/doc/snippets/qtquickcontrols-swipedelegate-custom.qml | 2 +- src/quickcontrols/doc/snippets/qtquickcontrols-swipeview-custom.qml | 2 +- src/quickcontrols/doc/snippets/qtquickcontrols-switch-custom.qml | 2 +- .../doc/snippets/qtquickcontrols-switchdelegate-custom.qml | 2 +- src/quickcontrols/doc/snippets/qtquickcontrols-tabbar-custom.qml | 2 +- src/quickcontrols/doc/snippets/qtquickcontrols-textarea-custom.qml | 2 +- src/quickcontrols/doc/snippets/qtquickcontrols-textfield-custom.qml | 2 +- src/quickcontrols/doc/snippets/qtquickcontrols-toolbar-custom.qml | 2 +- src/quickcontrols/doc/snippets/qtquickcontrols-toolbutton-custom.qml | 2 +- src/quickcontrols/doc/snippets/qtquickcontrols-toolseparator-custom.qml | 2 +- src/quickcontrols/doc/snippets/qtquickcontrols-tooltip-custom.qml | 2 +- src/quickcontrols/doc/snippets/qtquickcontrols-tumbler-custom.qml | 2 +- 40 files changed, 40 insertions(+), 40 deletions(-) (limited to 'src/quickcontrols/doc/snippets') diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-busyindicator-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-busyindicator-custom.qml index 3eefb11110..6829a5267a 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-busyindicator-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-busyindicator-custom.qml @@ -3,7 +3,7 @@ //! [file] import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Basic BusyIndicator { id: control diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-button-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-button-custom.qml index cf197a18ae..bdc95e615c 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-button-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-button-custom.qml @@ -3,7 +3,7 @@ //! [file] import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Basic Button { id: control diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-checkbox-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-checkbox-custom.qml index a7421af39c..9b1f6ec76a 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-checkbox-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-checkbox-custom.qml @@ -3,7 +3,7 @@ //! [file] import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Basic CheckBox { id: control diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-checkdelegate-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-checkdelegate-custom.qml index a4f4b84d18..de8441b4cf 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-checkdelegate-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-checkdelegate-custom.qml @@ -3,7 +3,7 @@ //! [file] import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Basic CheckDelegate { id: control diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-combobox-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-combobox-custom.qml index 2481f6dcf8..960600eec8 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-combobox-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-combobox-custom.qml @@ -3,7 +3,7 @@ //! [file] import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Basic ComboBox { id: control diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-delaybutton-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-delaybutton-custom.qml index a8b17ab36a..5c5f78ff12 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-delaybutton-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-delaybutton-custom.qml @@ -3,7 +3,7 @@ //! [file] import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Basic DelayButton { id: control diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-dial-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-dial-custom.qml index 49982c1496..26138a2c29 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-dial-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-dial-custom.qml @@ -3,7 +3,7 @@ //! [file] import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Basic Dial { id: control diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-frame-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-frame-custom.qml index de3e1a2327..da0139fa89 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-frame-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-frame-custom.qml @@ -3,7 +3,7 @@ //! [file] import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Basic Frame { background: Rectangle { diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-groupbox-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-groupbox-custom.qml index 34d9df8a63..fac65ee0d8 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-groupbox-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-groupbox-custom.qml @@ -3,7 +3,7 @@ //! [file] import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Basic GroupBox { id: control diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-itemdelegate-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-itemdelegate-custom.qml index 3212cbc762..a3a2a5b2e3 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-itemdelegate-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-itemdelegate-custom.qml @@ -3,7 +3,7 @@ //! [file] import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Basic ItemDelegate { id: control diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-label-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-label-custom.qml index 79bc9d3c13..6f34ed4292 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-label-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-label-custom.qml @@ -3,7 +3,7 @@ //! [file] import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Basic Label { text: qsTr("Label") diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-menu-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-menu-custom.qml index f38d5f370a..25cc379e47 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-menu-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-menu-custom.qml @@ -2,7 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Basic ApplicationWindow { id: window diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-menubar-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-menubar-custom.qml index 2d2d15efdf..c4067f9211 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-menubar-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-menubar-custom.qml @@ -2,7 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Basic ApplicationWindow { id: window diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-menuseparator-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-menuseparator-custom.qml index 2b66187e10..047f5e094d 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-menuseparator-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-menuseparator-custom.qml @@ -3,7 +3,7 @@ //! [file] import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Basic Item { id: window diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-pageindicator-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-pageindicator-custom.qml index 5372c41f31..7783706f89 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-pageindicator-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-pageindicator-custom.qml @@ -3,7 +3,7 @@ //! [file] import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Basic PageIndicator { id: control diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-pane-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-pane-custom.qml index 96e3db1f37..4a17ec8458 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-pane-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-pane-custom.qml @@ -3,7 +3,7 @@ //! [file] import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Basic Pane { background: Rectangle { diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-popup-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-popup-custom.qml index 951dfa7d52..80513175c3 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-popup-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-popup-custom.qml @@ -2,7 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Basic import QtQuick.Window Item { diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-progressbar-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-progressbar-custom.qml index a961debd44..61137ae22b 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-progressbar-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-progressbar-custom.qml @@ -3,7 +3,7 @@ //! [file] import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Basic ProgressBar { id: control diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-radiobutton-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-radiobutton-custom.qml index 929fe7e8e2..b6bcac9196 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-radiobutton-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-radiobutton-custom.qml @@ -3,7 +3,7 @@ //! [file] import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Basic RadioButton { id: control diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-radiodelegate-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-radiodelegate-custom.qml index 5eb856b8b5..9b7e25ff12 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-radiodelegate-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-radiodelegate-custom.qml @@ -3,7 +3,7 @@ //! [file] import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Basic RadioDelegate { id: control diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-rangeslider-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-rangeslider-custom.qml index 81bcb0d668..df41d19db5 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-rangeslider-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-rangeslider-custom.qml @@ -3,7 +3,7 @@ //! [file] import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Basic RangeSlider { id: control diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-scrollbar-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollbar-custom.qml index 2a4faede61..15ec0d19e4 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-scrollbar-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollbar-custom.qml @@ -3,7 +3,7 @@ //! [file] import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Basic ScrollBar { id: control diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-scrollindicator-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollindicator-custom.qml index f447fd4c94..dfc414cd86 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-scrollindicator-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollindicator-custom.qml @@ -3,7 +3,7 @@ //! [file] import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Basic ScrollIndicator { id: control diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-scrollview-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollview-custom.qml index 2f23b9fd58..7f92f89245 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-scrollview-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollview-custom.qml @@ -2,7 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Basic Item { width: 200 diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-slider-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-slider-custom.qml index 66e0bd7990..107cfce174 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-slider-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-slider-custom.qml @@ -3,7 +3,7 @@ //! [file] import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Basic Slider { id: control diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-spinbox-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-spinbox-custom.qml index b32106a5bd..f574cf3b32 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-spinbox-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-spinbox-custom.qml @@ -3,7 +3,7 @@ //! [file] import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Basic SpinBox { id: control diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-splitview-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-splitview-custom.qml index 0d5452c25d..5aad185a97 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-splitview-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-splitview-custom.qml @@ -2,7 +2,7 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Basic Item { width: 200 diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-stackview-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-stackview-custom.qml index 381fbe6b95..ab8865481f 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-stackview-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-stackview-custom.qml @@ -3,7 +3,7 @@ //! [file] import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Basic StackView { id: control diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-swipedelegate-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-swipedelegate-custom.qml index 973511c418..4571966031 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-swipedelegate-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-swipedelegate-custom.qml @@ -3,7 +3,7 @@ //! [file] import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Basic SwipeDelegate { id: control diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-swipeview-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-swipeview-custom.qml index e77bc9a3e8..02aba3ee08 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-swipeview-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-swipeview-custom.qml @@ -3,7 +3,7 @@ //! [file] import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Basic SwipeView { id: control diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-switch-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-switch-custom.qml index 5ca4b96140..3d1bab4c08 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-switch-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-switch-custom.qml @@ -3,7 +3,7 @@ //! [file] import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Basic Switch { id: control diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-switchdelegate-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-switchdelegate-custom.qml index 13cc7b4402..67c864eb2f 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-switchdelegate-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-switchdelegate-custom.qml @@ -3,7 +3,7 @@ //! [file] import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Basic SwitchDelegate { id: control diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-tabbar-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-tabbar-custom.qml index cdce972150..bed40c135b 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-tabbar-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-tabbar-custom.qml @@ -3,7 +3,7 @@ //! [file] import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Basic TabBar { id: control diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-textarea-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-textarea-custom.qml index 39a94e13cc..5efe94692f 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-textarea-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-textarea-custom.qml @@ -3,7 +3,7 @@ //! [file] import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Basic TextArea { id: control diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-textfield-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-textfield-custom.qml index c4d0c88c2a..e8bbc72f27 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-textfield-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-textfield-custom.qml @@ -3,7 +3,7 @@ //! [file] import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Basic TextField { id: control diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-toolbar-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-toolbar-custom.qml index 2aabcbfbe3..edfcd21901 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-toolbar-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-toolbar-custom.qml @@ -3,7 +3,7 @@ import QtQuick import QtQuick.Layouts -import QtQuick.Controls +import QtQuick.Controls.Basic //! [file] ToolBar { diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-toolbutton-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-toolbutton-custom.qml index 6ec46b0adf..4efb01215b 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-toolbutton-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-toolbutton-custom.qml @@ -3,7 +3,7 @@ //! [file] import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Basic ToolButton { id: control diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-toolseparator-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-toolseparator-custom.qml index 201e04b0e8..2ffb29ba7e 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-toolseparator-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-toolseparator-custom.qml @@ -4,7 +4,7 @@ import QtQuick import QtQuick.Layouts import QtQuick.Window -import QtQuick.Controls +import QtQuick.Controls.Basic //! [file] ToolBar { diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-tooltip-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-tooltip-custom.qml index 089e6d02b9..76f0f85acd 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-tooltip-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-tooltip-custom.qml @@ -3,7 +3,7 @@ //! [file] import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Basic Item { ToolTip { diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-tumbler-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-tumbler-custom.qml index 3487e7316d..473d6a3e48 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-tumbler-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-tumbler-custom.qml @@ -3,7 +3,7 @@ //! [file] import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Basic Tumbler { id: control -- cgit v1.2.3 From 0813a9d1c0b42da3b6731f99025313514eca5578 Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Thu, 4 Apr 2024 10:13:36 +0800 Subject: Doc: fix warning in ItemDelegate snippet The error was: TypeError: Cannot read property 'width' of null Change-Id: I0505e806130769fb7a2ed77b18c80393476edafd Reviewed-by: Richard Moe Gustavsen (cherry picked from commit 7e3e1295f4e240afc9532bc0ab47ff3644ffc008) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 4397d6490ad96be31b85af6acbc911c19d7682b9) (cherry picked from commit e3cc449dfc88a7a070df33b1a20b368e54b55775) --- src/quickcontrols/doc/snippets/qtquickcontrols-itemdelegate.qml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/quickcontrols/doc/snippets') diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-itemdelegate.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-itemdelegate.qml index 49c12b1dff..84e174c79d 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-itemdelegate.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-itemdelegate.qml @@ -6,6 +6,7 @@ import QtQuick.Controls //! [1] ListView { + id: listView width: 160 height: 240 @@ -13,7 +14,7 @@ ListView { delegate: ItemDelegate { text: modelData - width: parent.width + width: listView.width onClicked: console.log("clicked:", modelData) required property string modelData -- cgit v1.2.3 From d9b596393f7a98f8d3968a678260a29b116f368d Mon Sep 17 00:00:00 2001 From: Richard Moe Gustavsen Date: Mon, 1 Jul 2024 14:27:08 +0200 Subject: Doc snippet, menu: add menu items with addItem and not addMenu The example recommends to use Menu.addMenu(menu) to add MenuItems dynamically. This will cause run-time warnings to be printed, since a MenuItem is not a Menu. Instead, let the example use addItem for adding MenuItems dynamically. Change-Id: Icd8f54566ba27e0a2c31e6b79d83225ab9a3c879 Reviewed-by: Mitch Curtis (cherry picked from commit 591bcbb95c14b02e9e989ffc437712f5e856b449) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 71ed751bfe4346672cc3de366cf838f179d7dcd8) (cherry picked from commit ef4754c0b067d50eeb855253627f8b0958e21ef5) --- src/quickcontrols/doc/snippets/qtquickcontrols-menu-createObject.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/quickcontrols/doc/snippets') diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-menu-createObject.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-menu-createObject.qml index 31991ced70..47a900a20a 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-menu-createObject.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-menu-createObject.qml @@ -29,7 +29,7 @@ Row { onClicked: { let menuItem = menuItemComponent.createObject( menu.contentItem, { text: qsTr("New item") }) - menu.addMenu(menuItem) + menu.addItem(menuItem) } } } -- cgit v1.2.3 From 4f8f4aa99e5ceb22bbf275542b9c1e77b54b86c5 Mon Sep 17 00:00:00 2001 From: Mitch Curtis Date: Thu, 20 Jun 2024 14:58:33 +0800 Subject: Controls: replace Qt.styleHints with Application.styleHints As mentioned in QTBUG-95540, using the latter provides better type information for tooling, and avoids the "this property only exists on the object if Quick has been imported" issue. Replace QtQml import in Fluent style's Config.qml with QtQuick to provide access to the Application type. Fixes: QTBUG-126512 Change-Id: I4aac22e54f3b522f74acafd467ce22139352c9dd Reviewed-by: Ulf Hermann (cherry picked from commit 9335b0fd1f2358110b88127c9b34fa6867a14069) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit d70e645ca8071789e7d1906114b96ec36233179b) (cherry picked from commit 2a40db4f99ca6ab02f55968a422172cebc4f10a9) --- src/quickcontrols/doc/snippets/qtquickcontrols-headerview.qml | 2 +- src/quickcontrols/doc/snippets/qtquickcontrols-tooltip-pressandhold.qml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/quickcontrols/doc/snippets') diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-headerview.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-headerview.qml index b8f6935010..9866e41e97 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-headerview.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-headerview.qml @@ -16,7 +16,7 @@ ApplicationWindow { anchors.fill: parent // The background color will show through the cell // spacing, and therefore become the grid line color. - color: Qt.styleHints.appearance === Qt.Light ? palette.mid : palette.midlight + color: Application.styleHints.appearance === Qt.Light ? palette.mid : palette.midlight HorizontalHeaderView { id: horizontalHeader diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-tooltip-pressandhold.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-tooltip-pressandhold.qml index e209ce9ce9..9857d3899a 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-tooltip-pressandhold.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-tooltip-pressandhold.qml @@ -9,7 +9,7 @@ Button { text: qsTr("Button") ToolTip.visible: pressed - ToolTip.delay: Qt.styleHints.mousePressAndHoldInterval + ToolTip.delay: Application.styleHints.mousePressAndHoldInterval ToolTip.text: qsTr("This tool tip is shown after pressing and holding the button down.") } //! [1] -- cgit v1.2.3 From a544b577745fa61189b433b0f462981fc69b2e22 Mon Sep 17 00:00:00 2001 From: Richard Moe Gustavsen Date: Tue, 20 Aug 2024 12:26:45 +0200 Subject: doc, QQuickHeaderView: ensure example snippet works As it stood, the qdoc marker in the example code left the final curly brace out of the snippet. A copy paste of this example would therefore not compile. This patch will make sure the brace is a part of the snippet shown in the docs. Task-number: QTBUG-123595 Pick-to: 6.2 Change-Id: I68bfac0cfc3dcecd487bfb69de07c317f787552e Reviewed-by: Santhosh Kumar (cherry picked from commit 3968ef8650da91c8e66d1651f7891793ac3b5d74) Reviewed-by: Qt Cherry-pick Bot (cherry picked from commit 9ecc9131ed9be2ad421e3ced0b589c00205de2d5) (cherry picked from commit 303bd79ec66a5752405c32afe0d703f119983e67) --- src/quickcontrols/doc/snippets/qtquickcontrols-headerview.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/quickcontrols/doc/snippets') diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-headerview.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-headerview.qml index 9866e41e97..1ede3fce69 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-headerview.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-headerview.qml @@ -75,5 +75,5 @@ ApplicationWindow { } } } -//![0] } +//![0] -- cgit v1.2.3