diff --git a/CMakeLists.txt b/CMakeLists.txt --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -83,7 +83,7 @@ set(AKONADI_LIB_VERSION "5.12.40") set(INCIDENCEEDITOR_LIB_VERSION "5.12.40") set(KTNEF_LIB_VERSION "5.12.40") -set(MESSAGELIB_LIB_VERSION "5.12.45") +set(MESSAGELIB_LIB_VERSION "5.12.46") set(AKONADICALENDAR_LIB_VERSION "5.12.40") set(CALENDAR_UTILS_VERSION "5.12.40") set(KPIMTEXTEDIT_LIB_VERSION "5.12.41") diff --git a/plugins/messageviewer/bodypartformatter/autotests/rendertest-akonadi.cpp b/plugins/messageviewer/bodypartformatter/autotests/rendertest-akonadi.cpp --- a/plugins/messageviewer/bodypartformatter/autotests/rendertest-akonadi.cpp +++ b/plugins/messageviewer/bodypartformatter/autotests/rendertest-akonadi.cpp @@ -99,19 +99,19 @@ // render the mail MessageViewer::FileHtmlWriter fileWriter(outFileName); - fileWriter.begin(); QImage paintDevice; MessageViewer::CSSHelperBase cssHelper(&paintDevice); MimeTreeParser::NodeHelper nodeHelper; TestObjectTreeSource testSource(&fileWriter, &cssHelper); MimeTreeParser::ObjectTreeParser otp(&testSource, &nodeHelper); + otp.parseObjectTree(msg.data()); + + fileWriter.begin(); fileWriter.write(QStringLiteral("\n" "\n" "\n")); - - otp.parseObjectTree(msg.data()); - + testSource.render(otp.parsedPart(), false); fileWriter.write(QStringLiteral("")); fileWriter.end(); diff --git a/plugins/messageviewer/bodypartformatter/autotests/rendertest.cpp b/plugins/messageviewer/bodypartformatter/autotests/rendertest.cpp --- a/plugins/messageviewer/bodypartformatter/autotests/rendertest.cpp +++ b/plugins/messageviewer/bodypartformatter/autotests/rendertest.cpp @@ -97,19 +97,19 @@ // render the mail MessageViewer::FileHtmlWriter fileWriter(outFileName); - fileWriter.begin(); QImage paintDevice; MessageViewer::CSSHelperBase cssHelper(&paintDevice); MimeTreeParser::NodeHelper nodeHelper; TestObjectTreeSource testSource(&fileWriter, &cssHelper); MimeTreeParser::ObjectTreeParser otp(&testSource, &nodeHelper); + otp.parseObjectTree(msg.data()); + + fileWriter.begin(); fileWriter.write(QStringLiteral("\n" "\n" "\n")); - - otp.parseObjectTree(msg.data()); - + testSource.render(otp.parsedPart(), false); fileWriter.write(QStringLiteral("")); fileWriter.end(); @@ -142,35 +142,36 @@ // render the mail QEventLoop loop; MessageViewer::FileHtmlWriter fileWriter(outFileName); - fileWriter.begin(); QImage paintDevice; MessageViewer::CSSHelperBase cssHelper(&paintDevice); MimeTreeParser::NodeHelper nodeHelper; TestObjectTreeSource testSource(&fileWriter, &cssHelper); testSource.setShowSignatureDetails(true); MimeTreeParser::ObjectTreeParser otp(&testSource, &nodeHelper); - fileWriter.write(QStringLiteral("\n" - "\n" - "\n")); - connect(&nodeHelper, &MimeTreeParser::NodeHelper::update, &loop, &QEventLoop::quit); otp.parseObjectTree(msg.data()); + fileWriter.begin(); + fileWriter.write(QStringLiteral("\n" + "\n" + "\n")); + testSource.render(otp.parsedPart(), false); fileWriter.write(QStringLiteral("")); fileWriter.end(); compareFile(outFileName, referenceFileName + QStringLiteral(".running")); loop.exec(); { MimeTreeParser::ObjectTreeParser otp(&testSource, &nodeHelper); + otp.parseObjectTree(msg.data()); + fileWriter.begin(); fileWriter.write(QStringLiteral("\n" "\n" "\n")); - otp.parseObjectTree(msg.data()); - + testSource.render(otp.parsedPart(), false); fileWriter.write(QStringLiteral("")); fileWriter.end(); diff --git a/plugins/messageviewerheaderplugins/autotests/grantleeheaderstyleplugintest.cpp b/plugins/messageviewerheaderplugins/autotests/grantleeheaderstyleplugintest.cpp --- a/plugins/messageviewerheaderplugins/autotests/grantleeheaderstyleplugintest.cpp +++ b/plugins/messageviewerheaderplugins/autotests/grantleeheaderstyleplugintest.cpp @@ -24,6 +24,7 @@ #include #include +#include #include #include @@ -157,6 +158,8 @@ auto aMsg = readAndParseMail(mailFileName); MessageViewer::GrantleeHeaderStylePlugin plugin; auto *style = plugin.headerStyle(); + MimeTreeParser::NodeHelper nodeHelper; + style->setNodeHelper(&nodeHelper); KActionMenu *menu = new KActionMenu(this); QActionGroup *act = new QActionGroup(this);