diff options
author | Titta Heikkala <titta.heikkala@digia.com> | 2012-08-09 10:54:09 +0300 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-30 08:54:59 +0200 |
commit | 1cebd906af95e2c8ae37f1eae4a1c5019640b3b3 (patch) | |
tree | 4720835ce8fa3d0018a9a364b7d9994a5e470059 /tests/auto/printsupport | |
parent | f7de5b09234e7dd735d91a7b332d841ca6c6fe53 (diff) |
Ensure that printer orientation is preserved
After setting the printer name the initialization is no longer done for
a printer with a name. Instead doReinit() method is called to preserve
the orientation (set with setOrientation() method before calling
setPrinterName()). Before the orientation was changed back to default
when setPrinterName() method was called ignoring the orientation set.
Updated also the autotest because the case:
taskQTBUG4497_reusePrinterOnDifferentFiles() is no longer expected to
fail on Windows.
Task-number: QTBUG-26008
Change-Id: Ia6bc9ae14d79a646e61bfc97652f9f5af90738b3
Reviewed-by: Andy Shaw
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'tests/auto/printsupport')
-rw-r--r-- | tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp b/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp index 9e08c594c4..4b4756bd5e 100644 --- a/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp +++ b/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp @@ -985,7 +985,9 @@ 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()); } |