diff options
author | Maks Naumov <maksqwe1@ukr.net> | 2014-09-03 10:39:07 +0300 |
---|---|---|
committer | Maks Naumov <maksqwe1@ukr.net> | 2014-09-05 13:12:21 +0200 |
commit | 9c4c0443389fd3dace13a04849c8c03481d6cbdb (patch) | |
tree | eb22dbddea2216f80e1d43e723459180ba7c48d3 /src | |
parent | 863f598b650417824a8d531badc7a9d074af64be (diff) |
GraphicsView: Fix resolvePalette() for QGraphicsItem's children
Use a proper function for that.
Change-Id: I166ce44b8987d522cb01bae57009b2b862851b92
Reviewed-by: Andreas Aardal Hanssen <andreas@hanssen.name>
Diffstat (limited to 'src')
-rw-r--r-- | src/widgets/graphicsview/qgraphicsitem_p.h | 2 | ||||
-rw-r--r-- | src/widgets/graphicsview/qgraphicsscene.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/widgets/graphicsview/qgraphicsitem_p.h b/src/widgets/graphicsview/qgraphicsitem_p.h index 4d1835f178..7e3a01ef8b 100644 --- a/src/widgets/graphicsview/qgraphicsitem_p.h +++ b/src/widgets/graphicsview/qgraphicsitem_p.h @@ -318,7 +318,7 @@ public: virtual void resolvePalette(uint inheritedMask) { for (int i = 0; i < children.size(); ++i) - children.at(i)->d_ptr->resolveFont(inheritedMask); + children.at(i)->d_ptr->resolvePalette(inheritedMask); } virtual bool isProxyWidget() const; diff --git a/src/widgets/graphicsview/qgraphicsscene.cpp b/src/widgets/graphicsview/qgraphicsscene.cpp index 1cd162e6bb..df74352e2b 100644 --- a/src/widgets/graphicsview/qgraphicsscene.cpp +++ b/src/widgets/graphicsview/qgraphicsscene.cpp @@ -1608,9 +1608,9 @@ void QGraphicsScenePrivate::updatePalette(const QPalette &palette) // whose parent is not a widget. foreach (QGraphicsItem *item, q->items()) { if (!item->parentItem()) { - // Resolvefont for an item is a noop operation, but + // ResolvePalette for an item is a noop operation, but // every item can be a widget, or can have a widget - // childre. + // children. item->d_ptr->resolvePalette(palette.resolve()); } } |