diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-10 01:00:25 +0200 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2018-04-10 01:00:26 +0200 |
| commit | e027c7241f073f5fc8c1db88700cc83635b6454f (patch) | |
| tree | 69920e408b5eeb1547c0241696cfa845af85e4be /tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp | |
| parent | b2035d38e8dfdfe2ba8da96df5c1174f01dfbb5b (diff) | |
| parent | 3b85d53913741660473dbc242a48c2ee65d51421 (diff) | |
Merge remote-tracking branch 'origin/5.11' into dev
Change-Id: I0120f804522c0c652e9537b6e9fe08189f071ed2
Diffstat (limited to 'tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp')
| -rw-r--r-- | tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp b/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp index 314cce0270..a612f0749b 100644 --- a/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp +++ b/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp @@ -592,10 +592,14 @@ void tst_QPrinter::printDialogCompleter() { QPrintDialog dialog; dialog.printer()->setOutputFileName(testPdfFileName(QLatin1String("file"))); +#if defined(Q_OS_WIN) || defined(Q_OS_DARWIN) + if (dialog.printer()->outputFormat() != QPrinter::NativeFormat) + QSKIP("Dialog cannot be used with non-native formats"); +#endif dialog.setEnabledOptions(QAbstractPrintDialog::PrintToFile); dialog.show(); - QTest::qWait(100); + QVERIFY(QTest::qWaitForWindowActive(&dialog)); QTest::keyClick(&dialog, Qt::Key_Tab); QTest::keyClick(&dialog, 'P'); |