diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-12 16:41:52 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-04-12 16:41:52 (GMT) |
| commit | 0ef6bb1dfadf8e83f20e2282ff4a73a466b3de87 (patch) | |
| tree | 7441b0f5235566477b9875d1a65cc0d7b033a6e3 /tests | |
| parent | 72c0128f607d1566ede78dfbba90507086e3fe80 (diff) | |
| parent | d3c1dea37f95ba2bb75a2a264e4d806c4c0c36f3 (diff) | |
| download | Qt-0ef6bb1dfadf8e83f20e2282ff4a73a466b3de87.zip Qt-0ef6bb1dfadf8e83f20e2282ff4a73a466b3de87.tar.gz Qt-0ef6bb1dfadf8e83f20e2282ff4a73a466b3de87.tar.bz2 | |
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/oslo-staging-2:
CSS: fixes border only affecting the first widget.
fix closing state in QLocalSocket on Windows
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qcssparser/tst_qcssparser.cpp | 13 |
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() |