aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/palette
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@qt.io>2018-05-16 13:50:35 +0200
committerJ-P Nurmi <jpnurmi@qt.io>2018-05-22 14:20:49 +0000
commitf40dc11886e8130bad5771ed80920e6e72dfc09e (patch)
treea5395a9a7efd47e293901f1d7419a1140806c4d4 /tests/auto/palette
parent9338e1285e47060f3998ac19d047e93a11252ffb (diff)
QQuickTheme: add setters to make getters non-virtual
This allows us to add more themable attributes (on the side of fonts and palettes) after the QQuickTheme API has been made public, because it won't require adding virtuals. Only the resolve() method is virtual. Task-number: QTBUG-67062 Change-Id: I6a5cc8d15aeaa5a9a0fe9b6d2591077f8822daac Reviewed-by: Mitch Curtis <mitch.curtis@qt.io>
Diffstat (limited to 'tests/auto/palette')
-rw-r--r--tests/auto/palette/tst_palette.cpp14
1 files changed, 2 insertions, 12 deletions
diff --git a/tests/auto/palette/tst_palette.cpp b/tests/auto/palette/tst_palette.cpp
index 4c067e17..7bdbbdc3 100644
--- a/tests/auto/palette/tst_palette.cpp
+++ b/tests/auto/palette/tst_palette.cpp
@@ -221,21 +221,11 @@ class TestTheme : public QQuickTheme
public:
static const int NPalettes = QQuickTheme::Tumbler + 1;
- TestTheme()
+ void resolve() override
{
- std::fill(palettes, palettes + NPalettes, static_cast<QPalette *>(0));
-
for (int i = 0; i < NPalettes; ++i)
- palettes[i] = new QPalette(QColor::fromRgb(i));
+ setPalette(static_cast<Scope>(i), QPalette(QColor::fromRgb(i)));
}
-
- const QPalette *palette(Scope scope) const override
- {
- return palettes[scope];
- }
-
-private:
- QPalette *palettes[NPalettes];
};
Q_DECLARE_METATYPE(QQuickTheme::Scope)