Commit 68ee285c authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Merge remote-tracking branch 'origin/release/20.04'

parents 9cd49c7e a1f7f537
Pipeline #25577 passed with stage
in 7 minutes and 58 seconds
......@@ -33,6 +33,32 @@ public:
private Q_SLOTS:
void testPlainText();
void testPlainText_data();
// Test paragraph contents:
void testSingleFormat();
void testDoubleFormat();
void testDoubleStartDifferentFinish();
void testDoubleStartDifferentFinishReverseOrder();
void testDifferentStartDoubleFinish();
void testDifferentStartDoubleFinishReverseOrder();
void testOverlap();
void testAnchor();
void testAnchorWithFormattedContent();
void testAdjacentAnchors();
void testNestedFormatting();
void testSpan();
void testDoubleSpan();
void testSpanNesting();
void testEdgeCaseLeft();
void testEdgeCaseRight();
void testImage();
void testImageResized();
void testEachFormatTagSingly();
void testHorizontalRule();
void testNewlines();
void testEmptyParagraphs();
void testNewlinesThroughQTextCursor();
void testBrInsideParagraph();
void testLongDocument();
};
#endif // PLAINTEXTMARKUPBUILDERTEST_H
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd">
<html><head><meta name="qrichtext" content="1" /><style type="text/css">
p, li { white-space: pre-wrap; }
</style></head><body style=" font-family:&aps;DejaVu Sans&aps;; font-size:13pt; font-weight:400; font-style:normal;">
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;">Hello,</p>
<p style="margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; ">This is some text</p>
<p style="margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; ">It shows how grantlee is used from kmail</p>
<p style="margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; ">This is a URL: http://www.kde.org</p>
<p style="margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; ">No problem at all</p>
<p style="margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; ">It all works just fine</p>
<p style="margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; ">This is some text</p>
<p style="margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; ">This is some text</p>
<p style="margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; ">This is some text</p>
<p style="margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; ">This is some text</p>
<p style="margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; ">This is some text</p>
<p style="margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; ">This is some text</p>
<p style="margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; ">This is some text</p>
<p style="margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; ">This is some text</p>
<p style="margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; ">This is some text</p>
<p style="margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; ">This is some text</p>
<p style="margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; ">This is some text</p>
<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; -qt-user-state:0;">This is the end of the signature</p></body></html>
......@@ -216,7 +216,6 @@ void PlainTextMarkupBuilder::beginAnchor(const QString &href,
Q_D(PlainTextMarkupBuilder);
Q_UNUSED(name);
if (!d->m_urls.contains(href)) {
d->m_urls.append(href);
}
d->activeLink = href;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment