diff options
Diffstat (limited to 'src/quickcontrols/doc/snippets')
132 files changed, 598 insertions, 181 deletions
diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-action.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-action.qml index 4f50ba46d7..5b003e622c 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-action.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-action.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Controls diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-busyindicator-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-busyindicator-custom.qml index 3eefb11110..7e57e6bbe7 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-busyindicator-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-busyindicator-custom.qml @@ -1,9 +1,9 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //! [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..13ac86e549 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-button-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-button-custom.qml @@ -1,9 +1,9 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //! [file] import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Basic Button { id: control diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-button-icononly.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-button-icononly.qml index 027ecb4ed8..d56fee4b5a 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-button-icononly.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-button-icononly.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Controls diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-button-textbesideicon.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-button-textbesideicon.qml index c2dce1d99a..c2d2e8e52f 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-button-textbesideicon.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-button-textbesideicon.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Controls diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-button-textonly.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-button-textonly.qml index 4b12b8acc2..ef239d9814 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-button-textonly.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-button-textonly.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Controls diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-calendarmodel.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-calendarmodel.qml index af2777b123..c0fcda2d41 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-calendarmodel.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-calendarmodel.qml @@ -1,5 +1,5 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Controls diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-checkbox-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-checkbox-custom.qml index a7421af39c..1cc413aae3 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-checkbox-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-checkbox-custom.qml @@ -1,9 +1,9 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //! [file] import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Basic CheckBox { id: control diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-checkbox-group.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-checkbox-group.qml index 0d676be397..75f64593eb 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-checkbox-group.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-checkbox-group.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Controls diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-checkdelegate-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-checkdelegate-custom.qml index a4f4b84d18..2cee3313eb 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-checkdelegate-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-checkdelegate-custom.qml @@ -1,9 +1,9 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //! [file] import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Basic CheckDelegate { id: control diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-combobox-accepted.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-combobox-accepted.qml index 6f5eff6b55..0362041e18 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-combobox-accepted.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-combobox-accepted.qml @@ -1,5 +1,5 @@ // Copyright (C) 2019 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Controls diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-combobox-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-combobox-custom.qml index 2481f6dcf8..0cc408d492 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-combobox-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-combobox-custom.qml @@ -1,20 +1,25 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //! [file] +pragma ComponentBehavior: Bound + import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Basic ComboBox { id: control model: ["First", "Second", "Third"] delegate: ItemDelegate { + id: delegate + + required property var model + required property int index + width: control.width contentItem: Text { - text: control.textRole - ? (Array.isArray(control.model) ? modelData[control.textRole] : model[control.textRole]) - : modelData + text: delegate.model[control.textRole] color: "#21be2b" font: control.font elide: Text.ElideRight diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-combobox-find.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-combobox-find.qml index 2513002264..d6af08166f 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-combobox-find.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-combobox-find.qml @@ -1,5 +1,5 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Controls diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-combobox-popup.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-combobox-popup.qml index 8c636a3d5c..94ffa2b2bc 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-combobox-popup.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-combobox-popup.qml @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick.Controls diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-combobox-textat.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-combobox-textat.qml index 8910ba3237..e81ae17dd0 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-combobox-textat.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-combobox-textat.qml @@ -1,5 +1,5 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Controls diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-combobox-valuerole.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-combobox-valuerole.qml index 8d32201799..9329b19d1c 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-combobox-valuerole.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-combobox-valuerole.qml @@ -1,5 +1,5 @@ // Copyright (C) 2019 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Controls diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-container-oncurrentindexchanged.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-container-oncurrentindexchanged.qml new file mode 100644 index 0000000000..19b48191ee --- /dev/null +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-container-oncurrentindexchanged.qml @@ -0,0 +1,13 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + +import QtQuick.Controls + +Container { + //! [1] + onCurrentIndexChanged: { + print("currentIndex changed to", currentIndex) + // ... + } + //! [1] +} diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-custom-palette-buttons.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-custom-palette-buttons.qml new file mode 100644 index 0000000000..3b72207d87 --- /dev/null +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-custom-palette-buttons.qml @@ -0,0 +1,43 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + +//![entire] +import QtQuick +import QtQuick.Controls +import QtQuick.Layouts + +ApplicationWindow { + visible: true + + //![palette] + palette { + buttonText: "red" + button: "khaki" + + disabled { + buttonText: "lavender" + button: "coral" + } + } + //![palette] + + ColumnLayout { + id: layout + anchors.fill: parent + anchors.margins: 3 + Button { + text: qsTr("Disabled button") + enabled: false + } + + Button { + text: qsTr("Enabled button") + } + + TextField { + Layout.fillWidth: true + placeholderText: "type something here" + } + } +} +//![entire] diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-dayofweekrow-layout.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-dayofweekrow-layout.qml index 2358f252e0..7824faeb3e 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-dayofweekrow-layout.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-dayofweekrow-layout.qml @@ -1,5 +1,5 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Controls diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-dayofweekrow.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-dayofweekrow.qml index 2188b4ccf1..f5d1edab0f 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-dayofweekrow.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-dayofweekrow.qml @@ -1,5 +1,5 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Controls diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-delaybutton-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-delaybutton-custom.qml index a8b17ab36a..861c558e3c 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-delaybutton-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-delaybutton-custom.qml @@ -1,9 +1,9 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //! [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 f1efc22c4d..06399a318a 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-dial-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-dial-custom.qml @@ -1,15 +1,17 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //! [file] import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Basic Dial { id: control background: Rectangle { x: control.width / 2 - width / 2 y: control.height / 2 - height / 2 + implicitWidth: 140 + implicitHeight: 140 width: Math.max(64, Math.min(control.width, control.height)) height: width color: "transparent" diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-dialog-modal.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-dialog-modal.qml index ba1580a4df..7258df5873 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-dialog-modal.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-dialog-modal.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Controls diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-dialog-modeless.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-dialog-modeless.qml index d70c9921e2..05d06a7dae 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-dialog-modeless.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-dialog-modeless.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Controls diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-dialog.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-dialog.qml index 4d774c4e10..7fb50e6169 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-dialog.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-dialog.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Controls diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-dialogbuttonbox-attached.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-dialogbuttonbox-attached.qml index ef85771bfd..7582d605fa 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-dialogbuttonbox-attached.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-dialogbuttonbox-attached.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Controls diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-dialogbuttonbox.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-dialogbuttonbox.qml index 13a927520f..424be46707 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-dialogbuttonbox.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-dialogbuttonbox.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Controls diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-frame-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-frame-custom.qml index de3e1a2327..8498d9bae2 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-frame-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-frame-custom.qml @@ -1,9 +1,9 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //! [file] import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Basic Frame { background: Rectangle { diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-frame.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-frame.qml index fcb128db54..f5bfd6178f 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-frame.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-frame.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Layouts diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-groupbox-checkable.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-groupbox-checkable.qml index 0ab0822aca..fa6a91065f 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-groupbox-checkable.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-groupbox-checkable.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Layouts diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-groupbox-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-groupbox-custom.qml index 34d9df8a63..675e2d5e47 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-groupbox-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-groupbox-custom.qml @@ -1,9 +1,9 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //! [file] import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Basic GroupBox { id: control diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-groupbox.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-groupbox.qml index 98282ed348..9fb7a20873 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-groupbox.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-groupbox.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Layouts diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-headerview.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-headerview.qml new file mode 100644 index 0000000000..b8f6935010 --- /dev/null +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-headerview.qml @@ -0,0 +1,79 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + +//![0] +import QtQuick +import QtQuick.Controls +import Qt.labs.qmlmodels + +ApplicationWindow { + visible: true + width: 640 + height: 480 + title: qsTr("HeaderView") + + Rectangle { + 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 + + HorizontalHeaderView { + id: horizontalHeader + anchors.left: tableView.left + anchors.top: parent.top + syncView: tableView + clip: true + } + + VerticalHeaderView { + id: verticalHeader + anchors.top: tableView.top + anchors.left: parent.left + syncView: tableView + clip: true + } + + TableView { + id: tableView + anchors.left: verticalHeader.right + anchors.top: horizontalHeader.bottom + anchors.right: parent.right + anchors.bottom: parent.bottom + clip: true + + columnSpacing: 1 + rowSpacing: 1 + + model: TableModel { + TableModelColumn { display: "name" } + TableModelColumn { display: "color" } + + rows: [ + { + "name": "cat", + "color": "black" + }, + { + "name": "dog", + "color": "brown" + }, + { + "name": "bird", + "color": "white" + } + ] + } + + delegate: Rectangle { + implicitWidth: 100 + implicitHeight: 20 + color: palette.base + Label { + text: display + } + } + } + } +//![0] +} diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-itemdelegate-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-itemdelegate-custom.qml index 3212cbc762..5e299a9d8f 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-itemdelegate-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-itemdelegate-custom.qml @@ -1,9 +1,9 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //! [file] import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Basic ItemDelegate { id: control diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-itemdelegate.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-itemdelegate.qml index 49c12b1dff..33e9974094 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-itemdelegate.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-itemdelegate.qml @@ -1,11 +1,12 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick 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 diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-label-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-label-custom.qml index 79bc9d3c13..291d04948f 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-label-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-label-custom.qml @@ -1,9 +1,9 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //! [file] import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Basic Label { text: qsTr("Label") diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-label.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-label.qml index 7ca63d0251..3dae69a1e1 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-label.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-label.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Controls diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-material-accent.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-material-accent.qml index 71a84fac82..5c6b58533a 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-material-accent.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-material-accent.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Layouts diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-material-attributes.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-material-attributes.qml new file mode 100644 index 0000000000..1f0298de44 --- /dev/null +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-material-attributes.qml @@ -0,0 +1,120 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + +import QtQuick +import QtQuick.Controls.Material +import QtQuick.Shapes + +Pane { + width: 400 + height: 300 + + Page { + anchors.fill: parent + anchors.margins: 40 + + header: ToolBar { + Label { + text: "Material" + anchors.centerIn: parent + } + } + + TextField { + id: textField + text: "TextField" + anchors.centerIn: parent + + Component.onCompleted: forceActiveFocus() + } + } + + component Line: Shape { + // Account for 1-pixel-wide lines. + width: Math.max(1, endX - startX) + height: Math.max(1, endY - startY) + + layer.enabled: true + layer.samples: 4 + + property alias startX: shapePath.startX + property alias startY: shapePath.startY + property alias endX: pathLine.x + property alias endY: pathLine.y + + ShapePath { + id: shapePath + strokeWidth: 1 + strokeColor: "#444" + + PathLine { + id: pathLine + } + } + } + + Label { + id: primaryLabel + x: 40 + y: 3 + text: "Primary" + } + Line { + id: primaryLine + x: primaryLabel.x + primaryLabel.width / 2 + y: primaryLabel.y + primaryLabel.height + startX: 0.5 + startY: 0 + endX: 0.5 + endY: 40 + } + + Label { + id: foregroundLabel + anchors.horizontalCenter: parent.horizontalCenter + y: 3 + text: "Foreground" + } + Line { + id: foregroundLine + x: foregroundLabel.x + foregroundLabel.width / 2 + y: foregroundLabel.y + foregroundLabel.height + // Lines are drawn at the center of the pixel. + startX: 0.5 + startY: 0 + endX: 0.5 + endY: 34 + } + + Label { + id: accentLabel + anchors.horizontalCenter: parent.horizontalCenter + y: parent.height * 0.825 + text: "Accent" + } + Line { + id: accentLine + x: accentLabel.x + accentLabel.width / 2 + y: parent.height * 0.7 + startX: 0.5 + startY: 0 + endX: 0.5 + endY: 38 + } + + Label { + id: backgroundLabel + x: parent.width - width - 10 + y: parent.height - height - 10 + text: "Background" + } + Line { + id: backgroundLine + x: backgroundLabel.x + backgroundLabel.width / 2 + y: backgroundLabel.y - height + startX: 0.5 + startY: 0 + endX: 0.5 + endY: 40 + } +} diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-material-background.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-material-background.qml index f9f1dd0915..8d4829e17a 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-material-background.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-material-background.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Controls diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-material-elevation.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-material-elevation.qml index 4f8b27e7ef..8b84623dab 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-material-elevation.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-material-elevation.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Controls diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-material-foreground.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-material-foreground.qml index b4a7743c16..d2c120e0e1 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-material-foreground.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-material-foreground.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Controls diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-material-theme.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-material-theme.qml index 4e5bf81cd9..bacb630a28 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-material-theme.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-material-theme.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Controls diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-material-variant.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-material-variant.qml index ad824f1e34..bd2f42e66d 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-material-variant.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-material-variant.qml @@ -1,5 +1,15 @@ // Copyright (C) 2018 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + +/* + This file is used by tst_snippets to generate qtquickcontrols-material-variant-normal.png: + + SCREENSHOTS=1 ./tst_snippets verify:qtquickcontrols-material-variant + + and qtquickcontrols-material-variant-dense.png: + + SCREENSHOTS=1 QT_QUICK_CONTROLS_MATERIAL_VARIANT=Dense ./tst_snippets verify:qtquickcontrols-material-variant +*/ import QtQuick import QtQuick.Controls diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-menu-createObject.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-menu-createObject.qml index 31991ced70..c6582fc037 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-menu-createObject.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-menu-createObject.qml @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Controls diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-menu-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-menu-custom.qml index f38d5f370a..a0b59adffd 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-menu-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-menu-custom.qml @@ -1,8 +1,8 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Basic ApplicationWindow { id: window diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-menu-instantiator.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-menu-instantiator.qml index cda91182df..6ceeb217b3 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-menu-instantiator.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-menu-instantiator.qml @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Controls diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-menubar-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-menubar-custom.qml index 2d2d15efdf..ef55a5f4c2 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-menubar-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-menubar-custom.qml @@ -1,8 +1,8 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Basic ApplicationWindow { id: window diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-menubar.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-menubar.qml index 55064604b4..b7f3a32f80 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-menubar.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-menubar.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Controls diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-menuseparator-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-menuseparator-custom.qml index 2b66187e10..fbc024aa57 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-menuseparator-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-menuseparator-custom.qml @@ -1,9 +1,9 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //! [file] import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Basic Item { id: window diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-menuseparator.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-menuseparator.qml index 6be0de85bc..34c5933788 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-menuseparator.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-menuseparator.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //! [file] import QtQuick diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-monthgrid-layout.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-monthgrid-layout.qml index 0620ee6d0b..0ac8ef912e 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-monthgrid-layout.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-monthgrid-layout.qml @@ -1,5 +1,5 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Controls diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-monthgrid-localization.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-monthgrid-localization.qml index 56a801ab75..e5bdc4fa37 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-monthgrid-localization.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-monthgrid-localization.qml @@ -1,5 +1,5 @@ // Copyright (C) 2022 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause pragma ComponentBehavior: Bound diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-monthgrid.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-monthgrid.qml index c630edbe26..72aba7827f 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-monthgrid.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-monthgrid.qml @@ -1,5 +1,5 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Controls diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-overlay-modal.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-overlay-modal.qml index d1537d73bf..25a7485121 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-overlay-modal.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-overlay-modal.qml @@ -1,5 +1,5 @@ // Copyright (C) 2018 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Controls diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-overlay-modeless.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-overlay-modeless.qml index 06ebb16fb1..c51f8caea6 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-overlay-modeless.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-overlay-modeless.qml @@ -1,5 +1,5 @@ // Copyright (C) 2018 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Controls diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-overview.cmake b/src/quickcontrols/doc/snippets/qtquickcontrols-overview.cmake index 6aa63152db..cb9ccdf309 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-overview.cmake +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-overview.cmake @@ -1,5 +1,5 @@ # Copyright (C) 2022 The Qt Company Ltd. -# SPDX-License-Identifier: BSD-3-Clause +# SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause #! [0] find_package(Qt6 REQUIRED COMPONENTS QuickControls2) diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-pageindicator-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-pageindicator-custom.qml index 5372c41f31..14b4131c75 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-pageindicator-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-pageindicator-custom.qml @@ -1,9 +1,9 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //! [file] import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Basic PageIndicator { id: control diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-pageindicator-interactive.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-pageindicator-interactive.qml index e3e65beb22..d940f395ef 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-pageindicator-interactive.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-pageindicator-interactive.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick.Controls diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-pageindicator.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-pageindicator.qml index 6929565825..c0ae199360 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-pageindicator.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-pageindicator.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Controls diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-pane-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-pane-custom.qml index 96e3db1f37..aca3f73dc6 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-pane-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-pane-custom.qml @@ -1,9 +1,9 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //! [file] import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Basic Pane { background: Rectangle { diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-pane.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-pane.qml index ed1b80d4e8..88282170c7 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-pane.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-pane.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Layouts diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-popup-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-popup-custom.qml index 951dfa7d52..cae29d238d 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-popup-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-popup-custom.qml @@ -1,8 +1,8 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Basic import QtQuick.Window Item { diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-popup-property-propagation.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-popup-property-propagation.qml new file mode 100644 index 0000000000..7f34cd31e2 --- /dev/null +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-popup-property-propagation.qml @@ -0,0 +1,59 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + +//! [file] +import QtQuick.Controls.Basic + +ApplicationWindow { + width: 500 + height: 500 + visible: true + font.pixelSize: 20 + palette.windowText: "steelblue" + + // This will have a pixelSize of 20 and be "steelblue" in color. + header: Label { + text: "ApplicationWindow Label" + leftPadding: 20 + topPadding: 20 + } + + Pane { + width: 400 + height: 400 + anchors.centerIn: parent + palette.window: "#edf3f8" + palette.windowText: "tomato" + + // This will have a pixelSize of 20 and be "tomato" in color. + Label { + text: "Pane Label" + } + + Popup { + width: 300 + height: 300 + anchors.centerIn: parent + font.pixelSize: 10 + visible: true + + // This will have a pixelSize of 10 and "steelblue" in color. + Label { + text: "Popup Label" + } + + Popup { + width: 200 + height: 200 + anchors.centerIn: parent + visible: true + + // This will have a pixelSize of 20 and be "steelblue" in color. + Label { + text: "Child Popup Label" + } + } + } + } +} +//! [file] diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-popup.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-popup.qml index 5b9ec29fb2..5a768efeab 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-popup.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-popup.qml @@ -1,5 +1,5 @@ // Copyright (C) 2018 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Controls diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-progressbar-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-progressbar-custom.qml index 7158232081..97cad51926 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-progressbar-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-progressbar-custom.qml @@ -1,9 +1,9 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //! [file] import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Basic ProgressBar { id: control @@ -21,11 +21,40 @@ ProgressBar { implicitWidth: 200 implicitHeight: 4 + // Progress indicator for determinate state. Rectangle { width: control.visualPosition * parent.width height: parent.height radius: 2 color: "#17a81a" + visible: !control.indeterminate + } + + // Scrolling animation for indeterminate state. + Item { + anchors.fill: parent + visible: control.indeterminate + clip: true + + Row { + spacing: 20 + + Repeater { + model: control.width / 40 + 1 + + Rectangle { + color: "#17a81a" + width: 20 + height: control.height + } + } + XAnimator on x { + from: 0 + to: -40 + loops: Animation.Infinite + running: control.indeterminate + } + } } } } diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-radiobutton-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-radiobutton-custom.qml index 929fe7e8e2..3fa1659eec 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-radiobutton-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-radiobutton-custom.qml @@ -1,9 +1,9 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //! [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..55c571fab1 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-radiodelegate-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-radiodelegate-custom.qml @@ -1,9 +1,9 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //! [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..a83ebe8240 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-rangeslider-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-rangeslider-custom.qml @@ -1,9 +1,9 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //! [file] import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Basic RangeSlider { id: control diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-roundbutton.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-roundbutton.qml index d83e4abc32..a8f0e4405d 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-roundbutton.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-roundbutton.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Controls diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-scrollbar-active.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollbar-active.qml index 5292bc5499..d3b3044ec7 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-scrollbar-active.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollbar-active.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Controls diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-scrollbar-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollbar-custom.qml index 2a4faede61..d97627f083 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-scrollbar-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollbar-custom.qml @@ -1,9 +1,9 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //! [file] import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Basic ScrollBar { id: control diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-scrollbar-non-attached.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollbar-non-attached.qml index 6ba505b199..26f416f580 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-scrollbar-non-attached.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollbar-non-attached.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Controls diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-scrollbar-policy-alwayson-when-needed.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollbar-policy-alwayson-when-needed.qml new file mode 100644 index 0000000000..a960d7ccea --- /dev/null +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollbar-policy-alwayson-when-needed.qml @@ -0,0 +1,21 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + +import QtQuick +import QtQuick.Controls + +ListView { + id: listView + anchors.fill: parent + model: 20 + delegate: ItemDelegate { + width: listView.width + text: modelData + } + + ScrollBar.vertical: ScrollBar { + //! [1] + policy: listView.contentHeight > listView.height ? ScrollBar.AlwaysOn : ScrollBar.AlwaysOff + //! [1] + } +} diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-scrollbar-policy.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollbar-policy-alwayson.qml index 7f08912e7e..64286eb980 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-scrollbar-policy.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollbar-policy-alwayson.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Controls diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-scrollindicator-active.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollindicator-active.qml index 0f6afdfc4d..0522be2ca2 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-scrollindicator-active.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollindicator-active.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Controls diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-scrollindicator-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollindicator-custom.qml index f447fd4c94..c46832b2c3 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-scrollindicator-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollindicator-custom.qml @@ -1,9 +1,9 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //! [file] import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Basic ScrollIndicator { id: control diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-scrollindicator-non-attached.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollindicator-non-attached.qml index 063c771f1b..66d09e2698 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-scrollindicator-non-attached.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollindicator-non-attached.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Controls diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-scrollview-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollview-custom.qml index 2f23b9fd58..05c4ce413e 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-scrollview-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollview-custom.qml @@ -1,8 +1,8 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Basic Item { width: 200 diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-scrollview-interactive.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollview-interactive.qml index 3f7bc8eb6d..728b9d874f 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-scrollview-interactive.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollview-interactive.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Controls diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-scrollview-listview.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollview-listview.qml index 053e8e395a..4d1a0c7192 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-scrollview-listview.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollview-listview.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Controls diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-scrollview-policy.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollview-policy.qml index fa75cd14ed..445a14b4ee 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-scrollview-policy.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollview-policy.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Controls diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-scrollview.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollview.qml index e7f1adf758..18b6bc0de7 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-scrollview.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-scrollview.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Controls diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-selectionrectangle.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-selectionrectangle.qml index a53941e824..472b1b79d8 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-selectionrectangle.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-selectionrectangle.qml @@ -2,8 +2,6 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick - -import QtQuick import QtQuick.Window import QtQuick.Controls import QtQml.Models diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-slider-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-slider-custom.qml index 66e0bd7990..26565d3987 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-slider-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-slider-custom.qml @@ -1,9 +1,9 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //! [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..20b149d611 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-spinbox-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-spinbox-custom.qml @@ -1,9 +1,9 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //! [file] import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Basic SpinBox { id: control diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-spinbox-double.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-spinbox-double.qml index fe2dfbd722..ec1273d1af 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-spinbox-double.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-spinbox-double.qml @@ -1,32 +1,40 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Controls //! [1] SpinBox { - id: spinbox + id: spinBox from: 0 - value: 110 - to: 100 * 100 - stepSize: 100 + value: decimalToInt(1.1) + to: decimalToInt(100) + stepSize: decimalFactor + editable: true anchors.centerIn: parent property int decimals: 2 - property real realValue: value / 100 + property real realValue: value / decimalFactor + readonly property int decimalFactor: Math.pow(10, decimals) + + function decimalToInt(decimal) { + return decimal * decimalFactor + } validator: DoubleValidator { - bottom: Math.min(spinbox.from, spinbox.to) - top: Math.max(spinbox.from, spinbox.to) + bottom: Math.min(spinBox.from, spinBox.to) + top: Math.max(spinBox.from, spinBox.to) + decimals: spinBox.decimals + notation: DoubleValidator.StandardNotation } textFromValue: function(value, locale) { - return Number(value / 100).toLocaleString(locale, 'f', spinbox.decimals) + return Number(value / decimalFactor).toLocaleString(locale, 'f', spinBox.decimals) } valueFromText: function(text, locale) { - return Number.fromLocaleString(locale, text) * 100 + return Math.round(Number.fromLocaleString(locale, text) * decimalFactor) } } //! [1] diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-spinbox-prefix.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-spinbox-prefix.qml new file mode 100644 index 0000000000..4db5081210 --- /dev/null +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-spinbox-prefix.qml @@ -0,0 +1,30 @@ +// Copyright (C) 2023 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause + +import QtQuick +import QtQuick.Controls + +//! [1] +SpinBox { + id: spinBox + from: 0 + value: 11 + to: 100 + editable: true + anchors.centerIn: parent + + property string prefix: "L=" + property string suffix: "m" + + validator: RegularExpressionValidator { regularExpression: /\D*(-?\d*\.?\d*)\D*/ } + + textFromValue: function(value, locale) { + return prefix + Number(value).toLocaleString(locale, 'f', 0) + suffix + } + + valueFromText: function(text, locale) { + let re = /\D*(-?\d*\.?\d*)\D*/ + return Number.fromLocaleString(locale, re.exec(text)[1]) + } +} +//! [1] diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-spinbox-textual.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-spinbox-textual.qml index 271cad0f07..fcc932ee4d 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-spinbox-textual.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-spinbox-textual.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Controls diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-spinbox.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-spinbox.qml index 24fac81ca6..1813429dd5 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-spinbox.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-spinbox.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Controls diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-splitview-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-splitview-custom.qml index 0d5452c25d..bb2c29ac6a 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-splitview-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-splitview-custom.qml @@ -1,8 +1,8 @@ // Copyright (C) 2018 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Basic Item { width: 200 diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-splitview-handle-containmentmask.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-splitview-handle-containmentmask.qml index f12bfe1da8..08546f2f03 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-splitview-handle-containmentmask.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-splitview-handle-containmentmask.qml @@ -1,5 +1,5 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Controls diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-stackview-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-stackview-custom.qml index 381fbe6b95..2f0ea85c77 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-stackview-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-stackview-custom.qml @@ -1,9 +1,9 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //! [file] import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Basic StackView { id: control diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-stackview-visible.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-stackview-visible.qml index d711a02e1a..e22d4904b0 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-stackview-visible.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-stackview-visible.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Controls diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-swipedelegate-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-swipedelegate-custom.qml index 973511c418..eb691bc9d3 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-swipedelegate-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-swipedelegate-custom.qml @@ -1,9 +1,9 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //! [file] import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Basic SwipeDelegate { id: control diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-swipedelegate-transition.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-swipedelegate-transition.qml index 4215ea9202..3c461cfe4f 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-swipedelegate-transition.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-swipedelegate-transition.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Controls diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-swipedelegate.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-swipedelegate.qml index fb2df4f6d3..9470de2d31 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-swipedelegate.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-swipedelegate.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Controls @@ -21,6 +21,7 @@ ListView { required property string sender required property string title + required property int index ListView.onRemove: SequentialAnimation { PropertyAction { @@ -52,8 +53,6 @@ ListView { SwipeDelegate.onClicked: listView.model.remove(index) - required property int index - background: Rectangle { color: deleteLabel.SwipeDelegate.pressed ? Qt.darker("tomato", 1.1) : "tomato" } diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-swipeview-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-swipeview-custom.qml index e77bc9a3e8..cad89faa06 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-swipeview-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-swipeview-custom.qml @@ -1,9 +1,9 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //! [file] import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Basic SwipeView { id: control diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-swipeview-indicator.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-swipeview-indicator.qml index 1831d92b9f..62cd48ff14 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-swipeview-indicator.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-swipeview-indicator.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Controls diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-switch-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-switch-custom.qml index 5ca4b96140..c905d4c122 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-switch-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-switch-custom.qml @@ -1,9 +1,9 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //! [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..605e5476d5 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-switchdelegate-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-switchdelegate-custom.qml @@ -1,9 +1,9 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //! [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..4017553ef9 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-tabbar-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-tabbar-custom.qml @@ -1,9 +1,9 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //! [file] import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Basic TabBar { id: control diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-tabbar-explicit.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-tabbar-explicit.qml index 2293984e30..1c3e574d61 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-tabbar-explicit.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-tabbar-explicit.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Controls diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-tabbar-flickable.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-tabbar-flickable.qml index 3851b226bd..d686d452e9 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-tabbar-flickable.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-tabbar-flickable.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Controls diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-tabbar.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-tabbar.qml index 3ce32c1c50..cc3fdfaced 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-tabbar.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-tabbar.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Layouts diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-tabbutton.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-tabbutton.qml index c397092a8a..66994f8956 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-tabbutton.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-tabbutton.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Controls diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-textarea-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-textarea-custom.qml index 39a94e13cc..700cebafe1 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-textarea-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-textarea-custom.qml @@ -1,9 +1,9 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //! [file] import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Basic TextArea { id: control diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-textarea-scrollable.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-textarea-scrollable.qml index 7f915815e3..fe884140a1 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-textarea-scrollable.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-textarea-scrollable.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Controls diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-textfield-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-textfield-custom.qml index c4d0c88c2a..740e226662 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-textfield-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-textfield-custom.qml @@ -1,9 +1,9 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //! [file] import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Basic TextField { id: control diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-textfield-disabled.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-textfield-disabled.qml index aa8639190c..8b432ff827 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-textfield-disabled.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-textfield-disabled.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Controls diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-textfield-focused.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-textfield-focused.qml index 62299eeabc..e6892ec3f9 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-textfield-focused.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-textfield-focused.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Controls diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-textfield-normal.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-textfield-normal.qml index 72a5626142..272c3f3d6a 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-textfield-normal.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-textfield-normal.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Controls diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-toolbar-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-toolbar-custom.qml index 2aabcbfbe3..75e8f11778 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-toolbar-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-toolbar-custom.qml @@ -1,9 +1,9 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Layouts -import QtQuick.Controls +import QtQuick.Controls.Basic //! [file] ToolBar { diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-toolbar.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-toolbar.qml index cb07df80f6..64ec4d5431 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-toolbar.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-toolbar.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Layouts diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-toolbutton-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-toolbutton-custom.qml index 6ec46b0adf..ea81bc9766 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-toolbutton-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-toolbutton-custom.qml @@ -1,9 +1,9 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //! [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..28de544242 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-toolseparator-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-toolseparator-custom.qml @@ -1,10 +1,10 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause 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-toolseparator.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-toolseparator.qml index eb3543402d..f1fc11e7d9 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-toolseparator.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-toolseparator.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Layouts diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-tooltip-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-tooltip-custom.qml index 089e6d02b9..cde93b1abd 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-tooltip-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-tooltip-custom.qml @@ -1,9 +1,9 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //! [file] import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Basic Item { ToolTip { diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-tooltip-hover.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-tooltip-hover.qml index 289334d20d..b84f8c30da 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-tooltip-hover.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-tooltip-hover.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Controls diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-tooltip-pressandhold.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-tooltip-pressandhold.qml index e209ce9ce9..a2fd762d75 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-tooltip-pressandhold.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-tooltip-pressandhold.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Controls diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-tooltip-slider.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-tooltip-slider.qml index 823e7f1842..99b2d62047 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-tooltip-slider.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-tooltip-slider.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Window diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-tooltip.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-tooltip.qml index d0cf142376..1abaab2d62 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-tooltip.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-tooltip.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Window diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-tumbler-custom.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-tumbler-custom.qml index 3487e7316d..ee94097acd 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-tumbler-custom.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-tumbler-custom.qml @@ -1,9 +1,9 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //! [file] import QtQuick -import QtQuick.Controls +import QtQuick.Controls.Basic Tumbler { id: control diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-tumbler-listView.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-tumbler-listView.qml index 1b39c2aa16..1d531f0514 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-tumbler-listView.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-tumbler-listView.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Controls diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-tumbler-pathView.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-tumbler-pathView.qml index 30e90b2ba5..b3ef0bea68 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-tumbler-pathView.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-tumbler-pathView.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Controls diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-tumbler-timePicker.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-tumbler-timePicker.qml index a5d4b3585a..f174373c30 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-tumbler-timePicker.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-tumbler-timePicker.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause //! [tumbler] import QtQuick diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-universal-accent.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-universal-accent.qml index 52aca6eea9..6a0913dfe5 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-universal-accent.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-universal-accent.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Layouts diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-universal-background.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-universal-background.qml index 106549f789..a48dce116a 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-universal-background.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-universal-background.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Controls diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-universal-foreground.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-universal-foreground.qml index 491a4f94d4..a09011579a 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-universal-foreground.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-universal-foreground.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Controls diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-universal-theme.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-universal-theme.qml index 5ade2c7c55..55b8244561 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-universal-theme.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-universal-theme.qml @@ -1,5 +1,5 @@ // Copyright (C) 2017 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Controls diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-weeknumbercolumn-layout.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-weeknumbercolumn-layout.qml index 6d1dd1ba79..1c0cb34ce2 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-weeknumbercolumn-layout.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-weeknumbercolumn-layout.qml @@ -1,5 +1,5 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Controls diff --git a/src/quickcontrols/doc/snippets/qtquickcontrols-weeknumbercolumn.qml b/src/quickcontrols/doc/snippets/qtquickcontrols-weeknumbercolumn.qml index e3c757a0b8..3cff1a329e 100644 --- a/src/quickcontrols/doc/snippets/qtquickcontrols-weeknumbercolumn.qml +++ b/src/quickcontrols/doc/snippets/qtquickcontrols-weeknumbercolumn.qml @@ -1,5 +1,5 @@ // Copyright (C) 2021 The Qt Company Ltd. -// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR BSD-3-Clause import QtQuick import QtQuick.Controls |