diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-11-17 18:35:24 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-11-17 18:35:24 +0100 |
| commit | 4f2bb3e5a1ecbb1728209c7b2525c2c645ef49a2 (patch) | |
| tree | f3be806d0301078e69d3043c2ac1d370aca14825 /examples/quickcontrols2/gallery/gallery.qml | |
| parent | 170869fe1457fc68e96d46c9ff804071f86bd029 (diff) | |
| parent | 4ef7af98e69bf676dd39e6aad5e6a5f980648e75 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
src/quickcontrols2/qquickstyle.cpp
src/quicktemplates2/qquickslider.cpp
Change-Id: Ie12132690680706def6f516334a6ef0ba27336b3
Diffstat (limited to 'examples/quickcontrols2/gallery/gallery.qml')
| -rw-r--r-- | examples/quickcontrols2/gallery/gallery.qml | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/examples/quickcontrols2/gallery/gallery.qml b/examples/quickcontrols2/gallery/gallery.qml index a07872d5..06e7fc06 100644 --- a/examples/quickcontrols2/gallery/gallery.qml +++ b/examples/quickcontrols2/gallery/gallery.qml @@ -159,12 +159,9 @@ ApplicationWindow { ListElement { title: "Dial"; source: "qrc:/pages/DialPage.qml" } ListElement { title: "Dialog"; source: "qrc:/pages/DialogPage.qml" } ListElement { title: "Delegates"; source: "qrc:/pages/DelegatePage.qml" } - ListElement { title: "Drawer"; source: "qrc:/pages/DrawerPage.qml" } ListElement { title: "Frame"; source: "qrc:/pages/FramePage.qml" } ListElement { title: "GroupBox"; source: "qrc:/pages/GroupBoxPage.qml" } - ListElement { title: "Menu"; source: "qrc:/pages/MenuPage.qml" } ListElement { title: "PageIndicator"; source: "qrc:/pages/PageIndicatorPage.qml" } - ListElement { title: "Popup"; source: "qrc:/pages/PopupPage.qml" } ListElement { title: "ProgressBar"; source: "qrc:/pages/ProgressBarPage.qml" } ListElement { title: "RadioButton"; source: "qrc:/pages/RadioButtonPage.qml" } ListElement { title: "RangeSlider"; source: "qrc:/pages/RangeSliderPage.qml" } |