From 31f5c21ddb571d744efd1885c0687816b3a12225 Mon Sep 17 00:00:00 2001 From: Vitaly Fanaskov Date: Tue, 6 Aug 2019 15:50:22 +0200 Subject: Remove old QQuickPalette implementation The existing implementation was removed in order to reduce massive code duplication and simplify color resolving process. Unit tests were fixed accordingly. See related changes in the qtdeclarative module for the further details. [ChangeLog][General] the palette API is a part of QQuickItem now. Change-Id: Ic94ab4632e626c11d9b26f035e2a8a119c9088ef Reviewed-by: Simon Hausmann --- src/quicktemplates2/qquicktooltip.cpp | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'src/quicktemplates2/qquicktooltip.cpp') diff --git a/src/quicktemplates2/qquicktooltip.cpp b/src/quicktemplates2/qquicktooltip.cpp index 8b61375e..36b6ef5a 100644 --- a/src/quicktemplates2/qquicktooltip.cpp +++ b/src/quicktemplates2/qquicktooltip.cpp @@ -130,6 +130,8 @@ public: void startTimeout(); void stopTimeout(); + QPalette defaultPalette() const override { return QQuickTheme::palette(QQuickTheme::ToolTip); } + int delay = 0; int timeout = -1; QString text; @@ -311,11 +313,6 @@ QFont QQuickToolTip::defaultFont() const return QQuickTheme::font(QQuickTheme::ToolTip); } -QPalette QQuickToolTip::defaultPalette() const -{ - return QQuickTheme::palette(QQuickTheme::ToolTip); -} - void QQuickToolTip::itemChange(QQuickItem::ItemChange change, const QQuickItem::ItemChangeData &data) { Q_D(QQuickToolTip); -- cgit v1.2.3