diff options
| author | Mitch Curtis <mitch.curtis@digia.com> | 2014-02-13 17:47:04 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-02-26 16:46:44 +0100 |
| commit | 14d472ba5c882aa706c101b428cb6b3b42b30ede (patch) | |
| tree | 678f00c5dc33c0ee9c8d8835666648350ac02f10 /tests/manual | |
| parent | fae2e870ced5766061fe8e9f4c10183efefa024e (diff) | |
| download | qtquickcontrols-14d472ba5c882aa706c101b428cb6b3b42b30ede.tar.gz | |
Add Calendar to testbench.
Change-Id: Id8c636c768afd9eecba5517c66371dde179fd998
Reviewed-by: Jens Bache-Wiig <jens.bache-wiig@digia.com>
Reviewed-by: J-P Nurmi <jpnurmi@digia.com>
Diffstat (limited to 'tests/manual')
| -rw-r--r-- | tests/manual/testbench/content/Components.qml | 6 | ||||
| -rw-r--r-- | tests/manual/testbench/main.qml | 17 |
2 files changed, 20 insertions, 3 deletions
diff --git a/tests/manual/testbench/content/Components.qml b/tests/manual/testbench/content/Components.qml index be7bf972..a7cb51bc 100644 --- a/tests/manual/testbench/content/Components.qml +++ b/tests/manual/testbench/content/Components.qml @@ -39,12 +39,13 @@ ****************************************************************************/ import QtQuick 2.1 -import QtQuick.Controls 1.1 +import QtQuick.Controls 1.2 import QtQuick.Controls.Styles 1.1 import QtQuick.Controls.Private 1.0 Item { property Component button: Button { text: "Push me"} + property Component calendar: Calendar {} property Component checkbox: CheckBox { text: "A CheckBox" } property Component toolbutton: ToolButton { text: "A ToolButton" } property Component radiobutton: RadioButton { text: "A RadioButton" } @@ -116,6 +117,7 @@ Item { property var componentModel: ListModel { Component.onCompleted: { append({ name: "Button", component: button}); + append({ name: "Calendar", component: calendar}); append({ name: "BusyIndicator", component: busyIndicator}); append({ name: "ToolButton", component: toolbutton}); append({ name: "CheckBox", component: checkbox}); @@ -138,6 +140,7 @@ Item { } property Component buttonStyle: ButtonStyle {} + property Component calendarStyle: CalendarStyle {} property Component toolbuttonStyle: ToolButtonStyle {} property Component checkboxStyle: CheckBoxStyle {} property Component comboboxStyle: ComboBoxStyle {} @@ -161,6 +164,7 @@ Item { Component.onCompleted: { append({ name: "Button", component: buttonStyle}); append({ name: "BusyIndicator", component: busyIndicatorStyle}); + append({ name: "Calendar", component: calendarStyle}); append({ name: "ToolButton", component: toolbuttonStyle}); append({ name: "CheckBox", component: checkboxStyle}); append({ name: "ComboBox", component: comboboxStyle}); diff --git a/tests/manual/testbench/main.qml b/tests/manual/testbench/main.qml index 5ab9d66f..929b1937 100644 --- a/tests/manual/testbench/main.qml +++ b/tests/manual/testbench/main.qml @@ -38,8 +38,8 @@ ** ****************************************************************************/ -import QtQuick 2.1 -import QtQuick.Controls 1.1 +import QtQuick 2.2 +import QtQuick.Controls 1.2 import QtQuick.Layouts 1.0 import "content" @@ -214,6 +214,8 @@ ApplicationWindow { case "partiallyCheckedEnabled": case "alternatingRowColors": case "movableColumns": + case "gridVisible": + case "weekNumbersVisible": layout = layouts.boolLayout typeName = "Boolean"; break @@ -223,6 +225,8 @@ ApplicationWindow { case "decimals": case "currentIndex": case "sortIndicatorColumn": + case "visibleMonth": + case "visibleYear": layout = layouts.intLayout typeName = "Int" break; @@ -362,6 +366,15 @@ ApplicationWindow { enumModelData.append({ text: "Qt.PartiallyChecked", value: Qt.PartiallyChecked}); break; + case "dayOfWeekFormat": + layout = layouts.enumLayout + enumModelData = Qt.createQmlObject('import QtQuick 2.2; import QtQuick.Controls 1.2; ListModel {}', layout, ''); + typeName = "Enum"; + enumModelData.append({ text: "ShortFormat", value: Locale.ShortFormat}); + enumModelData.append({ text: "LongFormat", value: Locale.LongFormat}); + enumModelData.append({ text: "NarrowFormat", value: Locale.NarrowFormat}); + break; + default: break; |