diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-05 18:52:38 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-12-05 18:52:38 +0100 |
| commit | f6dbdd9c16166f345fd5743886229192c97c2c4f (patch) | |
| tree | 05e5e7b806dd627be4e3ba6fc9a32f115847acb0 /tests/auto/printsupport | |
| parent | b8084618545570a8832d344a2e9586e1226cc697 (diff) | |
| parent | 47efa9213d92a4366e03bd6d056837cd5bbadb1e (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
Conflicts:
src/sql/drivers/sqlite/qsql_sqlite.cpp
Change-Id: Ia7cffd2c99ae3d5eea6b5740683c06e921336dcd
Diffstat (limited to 'tests/auto/printsupport')
| -rw-r--r-- | tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp b/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp index 644cd33e5c..b8b4c00549 100644 --- a/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp +++ b/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp @@ -207,9 +207,6 @@ void tst_QPrinter::getSetCheck() QCOMPARE(obj1.printerSelectionOption(), QString::fromLatin1("--option")); #endif - obj1.setPrinterName(QString::fromLatin1("myPrinter")); - QCOMPARE(obj1.printerName(), QString::fromLatin1("myPrinter")); - // bool QPrinter::fontEmbeddingEnabled() // void QPrinter::setFontEmbeddingEnabled(bool) obj1.setFontEmbeddingEnabled(false); @@ -461,7 +458,7 @@ void tst_QPrinter::testNonExistentPrinter() QPainter painter; // Make sure it doesn't crash on setting or getting properties - printer.setPrinterName("some non existing printer"); + printer.printEngine()->setProperty(QPrintEngine::PPK_PrinterName, "some non existing printer"); printer.setPageSize(QPrinter::A4); printer.setOrientation(QPrinter::Portrait); printer.setFullPage(true); @@ -709,9 +706,6 @@ void tst_QPrinter::valuePreservation() printer.setCollateCopies(!status); printer.setOutputFormat(newFormat); -#ifdef Q_OS_MAC - QEXPECT_FAIL("","QTBUG-26430", Abort); -#endif QCOMPARE(printer.collateCopies(), !status); printer.setOutputFormat(oldFormat); QCOMPARE(printer.collateCopies(), !status); @@ -909,13 +903,6 @@ void tst_QPrinter::valuePreservation() printer.setOutputFormat(newFormat); printer.setOutputFormat(oldFormat); QCOMPARE(printer.printerName(), status); - - status = QString::fromLatin1("SuperDuperPrinter"); - printer.setPrinterName(status); - printer.setOutputFormat(newFormat); - QCOMPARE(printer.printerName(), status); - printer.setOutputFormat(oldFormat); - QCOMPARE(printer.printerName(), status); } // QPrinter::printerSelectionOption is explicitly documented not to be available on Windows. #ifndef Q_OS_WIN |