diff options
author | Sergio Ahumada <sergio.ahumada@nokia.com> | 2011-12-28 21:28:51 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2011-12-29 13:18:20 +0100 |
commit | 78c27380c6b029b7908642b92ea68aca649e2384 (patch) | |
tree | 6b9ddefb06dbe8c6d20981b3cd2af49023c557f6 /tests/auto/gui | |
parent | fb9b5d65d89d74050cf8cbb62485a70b54e3a1c6 (diff) | |
download | qtbase-78c27380c6b029b7908642b92ea68aca649e2384.tar.gz |
Fix printerPaperSize and some tst_qprinter test failures
Removing QEXPECT_FAIL accordingly.
Task-number: QTBUG-22296
Task-number: QTBUG-22562
Change-Id: I128a78897722cc067168ee50dbcbfc7537abdfcd
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
Diffstat (limited to 'tests/auto/gui')
-rw-r--r-- | tests/auto/gui/painting/qprinter/tst_qprinter.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/tests/auto/gui/painting/qprinter/tst_qprinter.cpp b/tests/auto/gui/painting/qprinter/tst_qprinter.cpp index d7b0ccba21..4767048929 100644 --- a/tests/auto/gui/painting/qprinter/tst_qprinter.cpp +++ b/tests/auto/gui/painting/qprinter/tst_qprinter.cpp @@ -191,7 +191,6 @@ void tst_QPrinter::getSetCheck() obj1.setPageSize(QPrinter::PageSize(QPrinter::A4)); QCOMPARE(QPrinter::PageSize(QPrinter::A4), obj1.pageSize()); obj1.setPageSize(QPrinter::PageSize(QPrinter::Letter)); - QEXPECT_FAIL("", "QTBUG-22562, QTBUG-22296", Abort); QCOMPARE(QPrinter::PageSize(QPrinter::Letter), obj1.pageSize()); obj1.setPageSize(QPrinter::PageSize(QPrinter::Legal)); QCOMPARE(QPrinter::PageSize(QPrinter::Legal), obj1.pageSize()); @@ -517,7 +516,6 @@ void tst_QPrinter::setGetPaperSize() p.setOutputFormat(QPrinter::PdfFormat); QSizeF size(500, 10); p.setPaperSize(size, QPrinter::Millimeter); - QEXPECT_FAIL("", "QTBUG-22562, QTBUG-22296", Abort); QCOMPARE(p.paperSize(QPrinter::Millimeter), size); QSizeF ptSize = p.paperSize(QPrinter::Point); //qDebug() << ptSize; @@ -760,7 +758,6 @@ void tst_QPrinter::valuePreservation() printer.setPageSize(QPrinter::B5); printer.setOutputFormat(newFormat); - QEXPECT_FAIL("", "QTBUG-22562, QTBUG-22296", Abort); QCOMPARE(printer.pageSize(), QPrinter::B5); printer.setOutputFormat(oldFormat); QCOMPARE(printer.pageSize(), QPrinter::B5); @@ -881,7 +878,6 @@ void tst_QPrinter::testCustomPageSizes() p.setPaperSize(customSize, QPrinter::Inch); QSizeF paperSize = p.paperSize(QPrinter::Inch); - QEXPECT_FAIL("", "QTBUG-22562, QTBUG-22296", Abort); QCOMPARE(paperSize, customSize); QPrinter p2(QPrinter::HighResolution); |