diff options
author | Liang Qi <liang.qi@qt.io> | 2019-09-06 10:34:06 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2019-09-06 10:34:06 +0200 |
commit | 742a20d0590d3a2b7d8f7e272c12124c9aba6fea (patch) | |
tree | 02c71ac6a21a24f3f43d69b16a0bcd36496c0dc4 /src/imports/controls | |
parent | 305c3cbfe3db51225ba30249cd70ed26a6c70c58 (diff) | |
parent | 616c430d2b7f36e70987df7b2dc97e71f0e8b589 (diff) |
Merge remote-tracking branch 'origin/5.12' into 5.15
Change-Id: If5c2806e52efc9608e476c3f068ee5a0e67ffff7
Diffstat (limited to 'src/imports/controls')
-rw-r--r-- | src/imports/controls/doc/snippets/qtquickcontrols2-combobox-accepted.qml | 45 | ||||
-rw-r--r-- | src/imports/controls/doc/src/qtquickcontrols2-navigation.qdoc | 2 |
2 files changed, 46 insertions, 1 deletions
diff --git a/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-accepted.qml b/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-accepted.qml new file mode 100644 index 00000000..9f2ad928 --- /dev/null +++ b/src/imports/controls/doc/snippets/qtquickcontrols2-combobox-accepted.qml @@ -0,0 +1,45 @@ +/**************************************************************************** +** +** Copyright (C) 2019 The Qt Company Ltd. +** Contact: https://www.qt.io/licensing/ +** +** This file is part of the documentation of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:FDL$ +** Commercial License Usage +** Licensees holding valid commercial Qt licenses may use this file in +** accordance with the commercial license agreement provided with the +** Software or, alternatively, in accordance with the terms contained in +** a written agreement between you and The Qt Company. For licensing terms +** and conditions see https://www.qt.io/terms-conditions. For further +** information use the contact form at https://www.qt.io/contact-us. +** +** GNU Free Documentation License Usage +** Alternatively, this file may be used under the terms of the GNU Free +** Documentation License version 1.3 as published by the Free Software +** Foundation and appearing in the file included in the packaging of +** this file. Please review the following information to ensure +** the GNU Free Documentation License version 1.3 requirements +** will be met: https://www.gnu.org/licenses/fdl-1.3.html. +** $QT_END_LICENSE$ +** +****************************************************************************/ + +import QtQuick 2.12 +import QtQuick.Controls 2.12 + +//! [combobox] +ComboBox { + editable: true + model: ListModel { + id: model + ListElement { text: "Banana" } + ListElement { text: "Apple" } + ListElement { text: "Coconut" } + } + onAccepted: { + if (find(editText) === -1) + model.append({text: editText}) + } +} +//! [combobox] diff --git a/src/imports/controls/doc/src/qtquickcontrols2-navigation.qdoc b/src/imports/controls/doc/src/qtquickcontrols2-navigation.qdoc index 7cc84ed6..ce4a6eae 100644 --- a/src/imports/controls/doc/src/qtquickcontrols2-navigation.qdoc +++ b/src/imports/controls/doc/src/qtquickcontrols2-navigation.qdoc @@ -55,7 +55,7 @@ scrolling. The page indicator on the bottom shows which is the presently active page. - \section1 TabBar + \section1 TabBar Control \image qtquickcontrols2-tabbar-wireframe.png |