CSS: fixes border only affecting the first widget.

Rules like  "Foo { border: 2px solid; }" does not specify the border color.
When the border color is not specified, it is assumed to be black.

When reading the brush value from the cache, we should take that
into account.

Note that this logic cannot be moved into brushFromData() as it is different
for the background. (when no color is specified, it is assumed to be transparent)

Reviewed-by: jbache
Task-number: QTBUG-9674 (part one)

1 files changed, 13 insertions, 0 deletions

diff --git a/tests/auto/qcssparser/tst_qcssparser.cpp b/tests/auto/qcssparser/tst_qcssparser.cpp
index ef102a0..966563c 100644
--- a/tests/auto/qcssparser/tst_qcssparser.cpp
+++ b/tests/auto/qcssparser/tst_qcssparser.cpp
@@ -1381,6 +1381,13 @@ void tst_QCssParser::shorthandBackgroundProperty()
     QTEST(image, "expectedImage");
     QTEST(int(repeat), "expectedRepeatValue");
     QTEST(int(alignment), "expectedAlignment");
+
+    //QTBUG-9674  : a second evaluation should give the same results
+    QVERIFY(v.extractBackground(&brush, &image, &repeat, &alignment, &origin, &attachment, &ignoredOrigin));
+    QVERIFY(expectedBrush.color() == brush.color());
+    QTEST(image, "expectedImage");
+    QTEST(int(repeat), "expectedRepeatValue");
+    QTEST(int(alignment), "expectedAlignment");
 }
 
 void tst_QCssParser::pseudoElement_data()
@@ -1644,6 +1651,12 @@ void tst_QCssParser::extractBorder()
     QVERIFY(widths[QCss::TopEdge] == expectedTopWidth);
     QVERIFY(styles[QCss::TopEdge] == expectedTopStyle);
     QVERIFY(colors[QCss::TopEdge] == expectedTopColor);
+
+    //QTBUG-9674  : a second evaluation should give the same results
+    QVERIFY(extractor.extractBorder(widths, colors, styles, radii));
+    QVERIFY(widths[QCss::TopEdge] == expectedTopWidth);
+    QVERIFY(styles[QCss::TopEdge] == expectedTopStyle);
+    QVERIFY(colors[QCss::TopEdge] == expectedTopColor);
 }
 
 void tst_QCssParser::noTextDecoration()