diff options
| author | Thomas Hartmann <Thomas.Hartmann@digia.com> | 2014-10-15 14:17:42 +0200 |
|---|---|---|
| committer | Tim Jenssen <tim.jenssen@digia.com> | 2014-10-16 15:07:51 +0200 |
| commit | b5140d760e53fca22eb99d7e38e6383cd1e793f8 (patch) | |
| tree | 00e032d0a3f8968e0eda6dc227568880a016d697 /tests | |
| parent | a18b067326bd58197dd70d4db9d9b79b01c2c8a9 (diff) | |
| download | qt-creator-b5140d760e53fca22eb99d7e38e6383cd1e793f8.tar.gz | |
Update manual tests for ui split
Changing some files to .ui.qml and extracting call to Qt.fontFamilies()
Change-Id: I6151fd088ba4ff8c2cbd9299bacb534639b0b18c
Reviewed-by: Tim Jenssen <tim.jenssen@digia.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/manual/qml/testprojects/uisplit/gallery/content/Controls.qml | 2 | ||||
| -rw-r--r-- | tests/manual/qml/testprojects/uisplit/gallery/content/ControlsForm.ui.qml | 3 | ||||
| -rw-r--r-- | tests/manual/qml/testprojects/uisplit/gallery/content/Layouts.ui.qml (renamed from tests/manual/qml/testprojects/uisplit/gallery/content/Layouts.qml) | 0 | ||||
| -rw-r--r-- | tests/manual/qml/testprojects/uisplit/gallery/content/Styles.ui.qml (renamed from tests/manual/qml/testprojects/uisplit/gallery/content/Styles.qml) | 0 |
4 files changed, 4 insertions, 1 deletions
diff --git a/tests/manual/qml/testprojects/uisplit/gallery/content/Controls.qml b/tests/manual/qml/testprojects/uisplit/gallery/content/Controls.qml index b5297e7d4f..b429191d35 100644 --- a/tests/manual/qml/testprojects/uisplit/gallery/content/Controls.qml +++ b/tests/manual/qml/testprojects/uisplit/gallery/content/Controls.qml @@ -48,5 +48,7 @@ ControlsForm { } } + fontComboBox.model: Qt.fontFamilies() + rowLayout1.data: [ ExclusiveGroup { id: tabPositionGroup } ] } diff --git a/tests/manual/qml/testprojects/uisplit/gallery/content/ControlsForm.ui.qml b/tests/manual/qml/testprojects/uisplit/gallery/content/ControlsForm.ui.qml index f7de3526a3..e42009cc76 100644 --- a/tests/manual/qml/testprojects/uisplit/gallery/content/ControlsForm.ui.qml +++ b/tests/manual/qml/testprojects/uisplit/gallery/content/ControlsForm.ui.qml @@ -37,6 +37,7 @@ Item { width: 640 height: 420 + property alias fontComboBox: fontComboBox property alias rowLayout1: rowLayout1 property alias button2: button2 property alias editableCombo: editableCombo @@ -76,7 +77,7 @@ Item { Layout.fillWidth: true } ComboBox { - model: Qt.fontFamilies() + id: fontComboBox Layout.fillWidth: true currentIndex: 47 } diff --git a/tests/manual/qml/testprojects/uisplit/gallery/content/Layouts.qml b/tests/manual/qml/testprojects/uisplit/gallery/content/Layouts.ui.qml index fd687d415e..fd687d415e 100644 --- a/tests/manual/qml/testprojects/uisplit/gallery/content/Layouts.qml +++ b/tests/manual/qml/testprojects/uisplit/gallery/content/Layouts.ui.qml diff --git a/tests/manual/qml/testprojects/uisplit/gallery/content/Styles.qml b/tests/manual/qml/testprojects/uisplit/gallery/content/Styles.ui.qml index 77b0a5f500..77b0a5f500 100644 --- a/tests/manual/qml/testprojects/uisplit/gallery/content/Styles.qml +++ b/tests/manual/qml/testprojects/uisplit/gallery/content/Styles.ui.qml |