diff options
Diffstat (limited to 'examples/quickcontrols2/gallery/gallery.qml')
| -rw-r--r-- | examples/quickcontrols2/gallery/gallery.qml | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/examples/quickcontrols2/gallery/gallery.qml b/examples/quickcontrols2/gallery/gallery.qml index 343ed0e2..4e2c05d6 100644 --- a/examples/quickcontrols2/gallery/gallery.qml +++ b/examples/quickcontrols2/gallery/gallery.qml @@ -40,7 +40,7 @@ import QtQuick 2.6 import QtQuick.Layouts 1.3 -import QtQuick.Controls 2.1 +import QtQuick.Controls 2.2 import QtQuick.Controls.Material 2.1 import QtQuick.Controls.Universal 2.1 import Qt.labs.settings 1.0 @@ -131,7 +131,7 @@ ApplicationWindow { id: drawer width: Math.min(window.width, window.height) / 3 * 2 height: window.height - dragMargin: stackView.depth > 1 ? 0 : undefined + interactive: stackView.depth === 1 ListView { id: listView @@ -156,6 +156,7 @@ ApplicationWindow { ListElement { title: "Button"; source: "qrc:/pages/ButtonPage.qml" } ListElement { title: "CheckBox"; source: "qrc:/pages/CheckBoxPage.qml" } ListElement { title: "ComboBox"; source: "qrc:/pages/ComboBoxPage.qml" } + ListElement { title: "DelayButton"; source: "qrc:/pages/DelayButtonPage.qml" } ListElement { title: "Dial"; source: "qrc:/pages/DialPage.qml" } ListElement { title: "Dialog"; source: "qrc:/pages/DialogPage.qml" } ListElement { title: "Delegates"; source: "qrc:/pages/DelegatePage.qml" } @@ -254,7 +255,7 @@ ApplicationWindow { ComboBox { id: styleBox property int styleIndex: -1 - model: ["Default", "Material", "Universal"] + model: availableStyles Component.onCompleted: { styleIndex = find(settings.style, Qt.MatchFixedString) if (styleIndex !== -1) |