summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/gui/painting/qpdf.cpp1
-rw-r--r--tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp3
2 files changed, 1 insertions, 3 deletions
diff --git a/src/gui/painting/qpdf.cpp b/src/gui/painting/qpdf.cpp
index cfa0a28fda..1371e3f68e 100644
--- a/src/gui/painting/qpdf.cpp
+++ b/src/gui/painting/qpdf.cpp
@@ -1521,6 +1521,7 @@ bool QPdfEngine::begin(QPaintDevice *pdev)
d->info = 0;
d->graphicsState = 0;
d->patternColorSpace = 0;
+ d->simplePen = false;
d->pages.clear();
d->imageCache.clear();
diff --git a/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp b/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp
index 4b4756bd5e..ca7fd4f7af 100644
--- a/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp
+++ b/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp
@@ -985,9 +985,6 @@ void tst_QPrinter::taskQTBUG4497_reusePrinterOnDifferentFiles()
QFile file2("out2.ps");
QVERIFY(file2.open(QIODevice::ReadOnly));
-#ifndef Q_OS_WIN
- QEXPECT_FAIL("", "QTBUG-22562, QTBUG-22296", Abort);
-#endif
QCOMPARE(file1.readAll(), file2.readAll());
}