diff options
| author | Andy Shaw <andy.shaw@digia.com> | 2013-11-05 20:18:49 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-05 23:04:16 +0100 |
| commit | 0cdf2a8023473e03121fc99194182a3fb86dd6aa (patch) | |
| tree | d2928e260a9860bbebb8a3d7afd20fdaa7ba88d2 /src/gui | |
| parent | 0c9a5698a1b03778471e5afb5b055f701459798c (diff) | |
Revert "Ensure CSS rules are inherited from the parent tags"
Since the original change caused a problem with the CSS
rules being always inherited where in some cases this should
not be happening.
This reverts commit 6f6546613774a48fe12f13f796ed7115dfe49a27.
Change-Id: I6e9cf163d752b1869b5e967a7ab59963d655ba87
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/text/qtexthtmlparser.cpp | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/gui/text/qtexthtmlparser.cpp b/src/gui/text/qtexthtmlparser.cpp index a131503b85..3cb61b9eae 100644 --- a/src/gui/text/qtexthtmlparser.cpp +++ b/src/gui/text/qtexthtmlparser.cpp @@ -1896,11 +1896,7 @@ QVector<QCss::Declaration> QTextHtmlParser::declarationsForNode(int node) const if (nodes.at(node).id == Html_a && nodes.at(node).hasHref) extraPseudo = "link"; decls = selector.declarationsForNode(n, extraPseudo); - n = selector.parentNode(n); - while (!selector.isNullNode(n)) { - decls = selector.declarationsForNode(n, extraPseudo) + decls; - n = selector.parentNode(n); - } + return decls; } |