Merge branch 'release/21.04'

src/printing/calprintdefaultplugins.cpp

@@ -1175,7 +1175,7 @@ void CalPrintWeek::print(QPainter &p, int width, int height)
             drawTimeTable(p, fromWeek, endLeft, false, mStartTime, mEndTime, weekBox, mIncludeDescription,
                            mIncludeCategories, mExcludeTime, mExcludeConfidential, mExcludePrivate);
             if (mPrintFooter) {
-                drawFooter(p, weekBox1);
+                drawFooter(p, footerBox);
             }
             mPrinter->newPage();
             drawSplitHeaderRight(p, fromWeek, curWeek, QDate(), width, hh);

src/printing/calprintpluginbase.cpp

@@ -2226,7 +2226,7 @@ void CalPrintPluginBase::drawSplitHeaderRight(QPainter &p, QDate fd, QDate td, Q
     }
 
     title += QString::number(fd.year());
-    p.drawText(0, lineSpacing, width, lineSpacing, Qt::AlignRight | Qt::AlignTop, title);
+    p.drawText(0, lineSpacing + padding(), width, lineSpacing, Qt::AlignRight | Qt::AlignTop, title);
 
     p.setFont(oldFont);
 }