diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2018-05-16 13:57:00 +0200 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2018-05-22 14:20:53 +0000 |
| commit | 1a3c1a089ff088482c9d093f4fa002e2d47cc103 (patch) | |
| tree | bc6c399af2fe531de7cc4851df0efe9fc5f4170f /tests | |
| parent | f40dc11886e8130bad5771ed80920e6e72dfc09e (diff) | |
QQuickTheme: rename themeFont() and themePalette()
We don't have the conflicting virtual getters anymore.
Change-Id: Ia20bfa0a0b1aa67c35a23270eb0241018f8e0ada
Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/font/tst_font.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/palette/tst_palette.cpp | 6 | ||||
| -rw-r--r-- | tests/auto/qquickapplicationwindow/tst_qquickapplicationwindow.cpp | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/font/tst_font.cpp b/tests/auto/font/tst_font.cpp index d01e928d..6746e39e 100644 --- a/tests/auto/font/tst_font.cpp +++ b/tests/auto/font/tst_font.cpp @@ -303,7 +303,7 @@ void tst_font::defaultFont() QVariant var = object->property("font"); QVERIFY(var.isValid()); - QFont expectedFont = QQuickTheme::themeFont(scope); + QFont expectedFont = QQuickTheme::font(scope); QFont actualFont = var.value<QFont>(); QCOMPARE(actualFont, expectedFont); } diff --git a/tests/auto/palette/tst_palette.cpp b/tests/auto/palette/tst_palette.cpp index 7bdbbdc3..ab7d9b16 100644 --- a/tests/auto/palette/tst_palette.cpp +++ b/tests/auto/palette/tst_palette.cpp @@ -87,7 +87,7 @@ void tst_palette::palette_data() QTest::addColumn<QString>("testFile"); QTest::addColumn<QPalette>("expectedPalette"); - QPalette defaultPalette = QQuickTheme::themePalette(QQuickTheme::System); + QPalette defaultPalette = QQuickTheme::palette(QQuickTheme::System); defaultPalette.setColor(QPalette::Base, QColor("#efefef")); defaultPalette.setColor(QPalette::Text, QColor("#101010")); @@ -171,7 +171,7 @@ void tst_palette::inheritance() QObject *grandChild = window->property("grandChild").value<QObject *>(); QVERIFY(control && child && grandChild); - QPalette defaultPalette = QQuickTheme::themePalette(QQuickTheme::System); + QPalette defaultPalette = QQuickTheme::palette(QQuickTheme::System); defaultPalette.setColor(QPalette::Base, QColor("#efefef")); defaultPalette.setColor(QPalette::Text, QColor("#101010")); @@ -299,7 +299,7 @@ void tst_palette::defaultPalette() QVariant var = object->property("palette"); QVERIFY(var.isValid()); - QPalette expectedPalette = QQuickTheme::themePalette(scope); + QPalette expectedPalette = QQuickTheme::palette(scope); QPalette actualPalette = var.value<QPalette>(); QCOMPARE(actualPalette, expectedPalette); } diff --git a/tests/auto/qquickapplicationwindow/tst_qquickapplicationwindow.cpp b/tests/auto/qquickapplicationwindow/tst_qquickapplicationwindow.cpp index ef2d0893..4ab3be4e 100644 --- a/tests/auto/qquickapplicationwindow/tst_qquickapplicationwindow.cpp +++ b/tests/auto/qquickapplicationwindow/tst_qquickapplicationwindow.cpp @@ -575,7 +575,7 @@ void tst_QQuickApplicationWindow::defaultFont() QScopedPointer<QQuickApplicationWindow> window; window.reset(static_cast<QQuickApplicationWindow *>(component.create())); QVERIFY(!window.isNull()); - QCOMPARE(window->font(), QQuickTheme::themeFont(QQuickTheme::System)); + QCOMPARE(window->font(), QQuickTheme::font(QQuickTheme::System)); } void tst_QQuickApplicationWindow::locale() |