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 /src/printsupport | |
| 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 'src/printsupport')
| -rw-r--r-- | src/printsupport/configure.json | 1 | ||||
| -rw-r--r-- | src/printsupport/dialogs/qprintdialog_unix.cpp | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/src/printsupport/configure.json b/src/printsupport/configure.json index e8cec22c09..abc704fa18 100644 --- a/src/printsupport/configure.json +++ b/src/printsupport/configure.json @@ -38,6 +38,7 @@ "label": "CUPS job control widget", "section": "Widgets", "condition": [ + "features.buttongroup", "features.calendarwidget", "features.checkbox", "features.combobox", diff --git a/src/printsupport/dialogs/qprintdialog_unix.cpp b/src/printsupport/dialogs/qprintdialog_unix.cpp index 51c8a593a1..71312d65f1 100644 --- a/src/printsupport/dialogs/qprintdialog_unix.cpp +++ b/src/printsupport/dialogs/qprintdialog_unix.cpp @@ -63,7 +63,9 @@ #include <QtWidgets/qdialogbuttonbox.h> +#if QT_CONFIG(completer) #include <private/qcompleter_p.h> +#endif #include "ui_qprintpropertieswidget.h" #include "ui_qprintsettingsoutput.h" #include "ui_qprintwidget.h" @@ -679,7 +681,7 @@ QUnixPrintWidgetPrivate::QUnixPrintWidgetPrivate(QUnixPrintWidget *p, QPrinter * } widget.properties->setEnabled(true); -#if QT_CONFIG(filesystemmodel) && !defined(QT_NO_COMPLETER) +#if QT_CONFIG(filesystemmodel) && QT_CONFIG(completer) QFileSystemModel *fsm = new QFileSystemModel(widget.filename); fsm->setRootPath(QDir::homePath()); widget.filename->setCompleter(new QCompleter(fsm, widget.filename)); |