diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2018-03-14 14:56:00 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2018-03-15 13:00:53 +0000 |
| commit | 87d3e84c75839b736d45f2773fc5fb4ecce14296 (patch) | |
| tree | d580764ae48ed0226763b9ad56a12c566acd8a75 /tests/auto/qquickapplicationwindow | |
| parent | 6d879ab06a95d6b49e5ca4ad0af12024d5d2a988 (diff) | |
Add QQuickTheme::Scope
Replace the old enums that were originally copied from QPlatformTheme,
including irrelevant entries for DockWidget, MdiSubWindow, MessageBox,
with a unified enum that will be matched to cover everything needed
for theming fonts and palettes for Qt Quick Controls 2.
Task-number: QTBUG-67062
Change-Id: Ia99d092f28c00210c0c7f24d4241eb5a5d9ceb5b
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'tests/auto/qquickapplicationwindow')
| -rw-r--r-- | tests/auto/qquickapplicationwindow/tst_qquickapplicationwindow.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/qquickapplicationwindow/tst_qquickapplicationwindow.cpp b/tests/auto/qquickapplicationwindow/tst_qquickapplicationwindow.cpp index ecd53b9e..1700829c 100644 --- a/tests/auto/qquickapplicationwindow/tst_qquickapplicationwindow.cpp +++ b/tests/auto/qquickapplicationwindow/tst_qquickapplicationwindow.cpp @@ -560,9 +560,9 @@ class TestTheme : public QQuickTheme public: TestTheme() : m_font("Courier") { } - const QFont *font(Font type) const override + const QFont *font(Scope scope) const override { - Q_UNUSED(type); + Q_UNUSED(scope); return &m_font; } @@ -580,7 +580,7 @@ void tst_QQuickApplicationWindow::defaultFont() QScopedPointer<QQuickApplicationWindow> window; window.reset(static_cast<QQuickApplicationWindow *>(component.create())); QVERIFY(!window.isNull()); - QCOMPARE(window->font(), QQuickTheme::themeFont(QQuickTheme::SystemFont)); + QCOMPARE(window->font(), QQuickTheme::themeFont(QQuickTheme::System)); } void tst_QQuickApplicationWindow::locale() |