summaryrefslogtreecommitdiffstats
path: root/src/widgets/styles/qstylesheetstyle.cpp
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@qt.io>2019-09-23 08:35:49 +0200
committerLiang Qi <liang.qi@qt.io>2019-09-23 08:35:49 +0200
commit6572650641a2f64f0dd4f41b0426bbd3698f6530 (patch)
treeb28400a2983e044dc7911607ff57b27a9c8cd1bc /src/widgets/styles/qstylesheetstyle.cpp
parent60e20abf19f58c34cb3a878636d955993b81cf2e (diff)
parentac5e198db4eea4670a5a4a22fb44eb8a6acc4c47 (diff)
Merge remote-tracking branch 'origin/5.13' into 5.14
Conflicts: src/widgets/styles/qstylesheetstyle.cpp Change-Id: If11da7799075cc2d5768da5603c5fc46773c4eae
Diffstat (limited to 'src/widgets/styles/qstylesheetstyle.cpp')
-rw-r--r--src/widgets/styles/qstylesheetstyle.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/widgets/styles/qstylesheetstyle.cpp b/src/widgets/styles/qstylesheetstyle.cpp
index 48d2e268b8..88c6c288e8 100644
--- a/src/widgets/styles/qstylesheetstyle.cpp
+++ b/src/widgets/styles/qstylesheetstyle.cpp
@@ -2735,6 +2735,11 @@ static void updateObjects(const QList<const QObject *>& objects)
if (auto widget = qobject_cast<QWidget*>(const_cast<QObject*>(object))) {
widget->style()->polish(widget);
QCoreApplication::sendEvent(widget, &event);
+ QList<const QObject *> children;
+ children.reserve(widget->children().size() + 1);
+ for (auto child: qAsConst(widget->children()))
+ children.append(child);
+ updateObjects(children);
}
}
}