aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/font/tst_font.cpp
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2018-03-14 13:04:30 +0100
committerJ-P Nurmi <jpnurmi@qt.io>2018-03-15 07:50:30 +0000
commit63773fd5363e8954e298e775bba7478d612134ef (patch)
tree6b85eecb285a010f6ba488cc631cd8107c6cdb76 /tests/auto/font/tst_font.cpp
parent24750ce0624e8b6ec66d07d7d00877c4a928dfc3 (diff)
QQuickTheme: add missing fonts and palettes
SpinBox, Switch, and Tumbler were previously not available in QPlatformTheme, but now we have our own enums so we can add them. Task-number: QTBUG-67062 Change-Id: Ie99a49b464fbbd25051181b75d721f537b8e3a68 Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'tests/auto/font/tst_font.cpp')
-rw-r--r--tests/auto/font/tst_font.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/font/tst_font.cpp b/tests/auto/font/tst_font.cpp
index 65dd4971..5b69e298 100644
--- a/tests/auto/font/tst_font.cpp
+++ b/tests/auto/font/tst_font.cpp
@@ -277,9 +277,9 @@ void tst_font::defaultFont_data()
QTest::newRow("ScrollBar") << "ScrollBar" << QQuickTheme::SystemFont;
QTest::newRow("ScrollIndicator") << "ScrollIndicator" << QQuickTheme::SystemFont;
QTest::newRow("Slider") << "Slider" << QQuickTheme::SystemFont;
- QTest::newRow("SpinBox") << "SpinBox" << QQuickTheme::EditorFont;
+ QTest::newRow("SpinBox") << "SpinBox" << QQuickTheme::SpinBoxFont;
QTest::newRow("SwipeDelegate") << "SwipeDelegate" << QQuickTheme::ListViewFont;
- QTest::newRow("Switch") << "Switch" << QQuickTheme::SystemFont; // ### TODO: add QQuickTheme::SwitchFont
+ QTest::newRow("Switch") << "Switch" << QQuickTheme::SwitchFont;
QTest::newRow("SwitchDelegate") << "SwitchDelegate" << QQuickTheme::ListViewFont;
QTest::newRow("TabBar") << "TabBar" << QQuickTheme::SystemFont;
QTest::newRow("TabButton") << "TabButton" << QQuickTheme::TabButtonFont;
@@ -289,7 +289,7 @@ void tst_font::defaultFont_data()
QTest::newRow("ToolButton") << "ToolButton" << QQuickTheme::ToolButtonFont;
QTest::newRow("ToolSeparator") << "ToolSeparator" << QQuickTheme::SystemFont;
QTest::newRow("ToolTip") << "ToolTip" << QQuickTheme::TipLabelFont;
- QTest::newRow("Tumbler") << "Tumbler" << QQuickTheme::ItemViewFont;
+ QTest::newRow("Tumbler") << "Tumbler" << QQuickTheme::TumblerFont;
}
void tst_font::defaultFont()