diff options
Diffstat (limited to 'tests/auto/qprinter')
-rw-r--r-- | tests/auto/qprinter/qprinter.pro | 1 | ||||
-rw-r--r-- | tests/auto/qprinter/tst_qprinter.cpp | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/tests/auto/qprinter/qprinter.pro b/tests/auto/qprinter/qprinter.pro index b412688544..cbe4ad7986 100644 --- a/tests/auto/qprinter/qprinter.pro +++ b/tests/auto/qprinter/qprinter.pro @@ -1,4 +1,5 @@ load(qttest_p4) +QT += printsupport widgets SOURCES += tst_qprinter.cpp mac*:CONFIG+=insignificant_test diff --git a/tests/auto/qprinter/tst_qprinter.cpp b/tests/auto/qprinter/tst_qprinter.cpp index f67f8af3bd..a6b6895981 100644 --- a/tests/auto/qprinter/tst_qprinter.cpp +++ b/tests/auto/qprinter/tst_qprinter.cpp @@ -533,11 +533,13 @@ void tst_QPrinter::testMulitpleSets() void tst_QPrinter::changingOutputFormat() { +#if QT_VERSION < 0x050000 QPrinter p; p.setOutputFormat(QPrinter::PostScriptFormat); p.setPageSize(QPrinter::A8); p.setOutputFormat(QPrinter::PdfFormat); QCOMPARE(p.pageSize(), QPrinter::A8); +#endif } void tst_QPrinter::outputFormatFromSuffix() @@ -546,8 +548,6 @@ void tst_QPrinter::outputFormatFromSuffix() QSKIP("No printers available.", SkipAll); QPrinter p; QVERIFY(p.outputFormat() == QPrinter::NativeFormat); - p.setOutputFileName("test.ps"); - QVERIFY(p.outputFormat() == QPrinter::PostScriptFormat); p.setOutputFileName("test.pdf"); QVERIFY(p.outputFormat() == QPrinter::PdfFormat); p.setOutputFileName(QString()); @@ -647,7 +647,7 @@ void tst_QPrinter::testPageMargins() void tst_QPrinter::valuePreservation() { QPrinter::OutputFormat oldFormat = QPrinter::PdfFormat; - QPrinter::OutputFormat newFormat = QPrinter::PostScriptFormat; + QPrinter::OutputFormat newFormat = QPrinter::NativeFormat; // TODO: Correct? { QPrinter printer; |