summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAndy Shaw <andy.shaw@digia.com>2014-02-19 10:28:39 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2014-02-20 08:14:04 +0100
commit9babaac16da14657ccf8629419328bf05c866eed (patch)
tree0efea39f7920f39b6a2b930a4c5aff9b5a550133 /src
parent72fbcc8bbf7bfae962ee9c3d3bccfc8253709bd4 (diff)
Only do a repolish() of the widget if it was already polished
By ensuring that the widget is already polished before doing a repolish it means that if you reset the stylesheet then it unsets any changes that the stylesheet had applied to the widget. Task-number: QTBUG-18958 Change-Id: Ie0aeda0dac9f2211b7feca138c115cf2b48aac80 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'src')
-rw-r--r--src/widgets/kernel/qwidget.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp
index 46aa93fe48..ba8147c4a6 100644
--- a/src/widgets/kernel/qwidget.cpp
+++ b/src/widgets/kernel/qwidget.cpp
@@ -2404,7 +2404,8 @@ void QWidget::setStyleSheet(const QString& styleSheet)
}
if (proxy) { // style sheet update
- proxy->repolish(this);
+ if (d->polished)
+ proxy->repolish(this);
return;
}