diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-09-06 13:26:31 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-09-06 13:26:31 +0200 |
| commit | 19dd2ca93b8b95a5e2792b29ed62ea23800fb53e (patch) | |
| tree | 17685d2a9628ec5936155e09da3edd74c9244b0e /tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp | |
| parent | 942922652481347659a0dae78758c334778a58d2 (diff) | |
| parent | d332a2d3ccb485c9decd6c47fa5a5fc02b59d27e (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.10
Conflicts:
examples/opengl/qopenglwidget/main.cpp
src/3rdparty/pcre2/src/pcre2_printint.c
src/plugins/platforms/cocoa/qnsview.mm
src/widgets/widgets/qcombobox.cpp
Change-Id: I37ced9da1e8056f95851568bcc52cd5dc34f56af
Diffstat (limited to 'tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp')
| -rw-r--r-- | tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp b/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp index cc32e73b9c..88bae686ab 100644 --- a/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp +++ b/tests/auto/printsupport/kernel/qprinter/tst_qprinter.cpp @@ -83,7 +83,7 @@ private slots: void customPaperSizeAndMargins(); void customPaperNameSettingBySize(); void customPaperNameSettingByName(); -#if !defined(QT_NO_COMPLETER) && QT_CONFIG(filedialog) +#if QT_CONFIG(completer) && QT_CONFIG(filedialog) void printDialogCompleter(); #endif void testCurrentPage(); @@ -587,7 +587,7 @@ void tst_QPrinter::customPaperSizeAndMargins() } } -#if !defined(QT_NO_COMPLETER) && QT_CONFIG(filedialog) +#if QT_CONFIG(completer) && QT_CONFIG(filedialog) void tst_QPrinter::printDialogCompleter() { QPrintDialog dialog; |