diff options
-rw-r--r-- | src/printsupport/kernel/qprintengine_win.cpp | 17 | ||||
-rw-r--r-- | tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp | 12 |
2 files changed, 8 insertions, 21 deletions
diff --git a/src/printsupport/kernel/qprintengine_win.cpp b/src/printsupport/kernel/qprintengine_win.cpp index 759a76de09..27351dee48 100644 --- a/src/printsupport/kernel/qprintengine_win.cpp +++ b/src/printsupport/kernel/qprintengine_win.cpp @@ -1174,16 +1174,6 @@ void QWin32PrintEnginePrivate::doReinit() if (state == QPrinter::Active) { reinit = true; } else { - if (!name.isEmpty()) { - HANDLE hCheckPrinter; - if (!OpenPrinter((LPWSTR)name.utf16(), (LPHANDLE)&hCheckPrinter, 0)) { - initialize(); - return; - } else { - ClosePrinter(hCheckPrinter); - hCheckPrinter = 0; - } - } resetDC(); initDevRects(); reinit = false; @@ -1306,12 +1296,9 @@ void QWin32PrintEngine::setProperty(PrintEnginePropertyKey key, const QVariant & case PPK_PrinterName: d->name = value.toString(); - if (d->name.isEmpty()) { + if (d->name.isEmpty()) d->queryDefault(); - d->initialize(); - } else { - d->doReinit(); - } + d->initialize(); break; case PPK_Resolution: diff --git a/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp b/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp index 7f872a4ffb..0f7c7f7a84 100644 --- a/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp +++ b/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp @@ -965,28 +965,28 @@ static void printPage(QPainter *painter) void tst_QPrinter::taskQTBUG4497_reusePrinterOnDifferentFiles() { - TempFileCleanup tmpFile1("out1.ps"); - TempFileCleanup tmpFile2("out2.ps"); + TempFileCleanup tmpFile1("out1.pdf"); + TempFileCleanup tmpFile2("out2.pdf"); QPrinter printer; { - printer.setOutputFileName("out1.ps"); + printer.setOutputFileName("out1.pdf"); QPainter painter(&printer); printPage(&painter); } { - printer.setOutputFileName("out2.ps"); + printer.setOutputFileName("out2.pdf"); QPainter painter(&printer); printPage(&painter); } - QFile file1("out1.ps"); + QFile file1("out1.pdf"); QVERIFY(file1.open(QIODevice::ReadOnly)); - QFile file2("out2.ps"); + QFile file2("out2.pdf"); QVERIFY(file2.open(QIODevice::ReadOnly)); while (!file1.atEnd() && !file2.atEnd()) { |