diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2020-02-04 01:00:59 +0100 |
|---|---|---|
| committer | Edward Welbourne <edward.welbourne@qt.io> | 2020-02-04 10:44:00 +0100 |
| commit | 97417e8f2896bfbe1d9e9a703ddba980983d1442 (patch) | |
| tree | ecee79f9b126bc695904e74000c0775d1ef34646 /src/printsupport/doc/snippets/printing-qprinter/errors.cpp | |
| parent | 02eb9df851093f11872c828869226903c81f1b60 (diff) | |
| parent | 056230cc9c3309823a93df0e34c92affb29df9e4 (diff) | |
Merge remote-tracking branch 'origin/5.14' into 5.15
Conflicts:
.qmake.conf
examples/widgets/widgets/imageviewer/imageviewer.cpp
src/corelib/text/qchar.cpp
src/corelib/time/qdatetime.cpp
Change-Id: I9762f5c4ff650799219729d6aee79ac07ce9024a
Diffstat (limited to 'src/printsupport/doc/snippets/printing-qprinter/errors.cpp')
| -rw-r--r-- | src/printsupport/doc/snippets/printing-qprinter/errors.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/printsupport/doc/snippets/printing-qprinter/errors.cpp b/src/printsupport/doc/snippets/printing-qprinter/errors.cpp index 40acf9293c..c07bb8b76d 100644 --- a/src/printsupport/doc/snippets/printing-qprinter/errors.cpp +++ b/src/printsupport/doc/snippets/printing-qprinter/errors.cpp @@ -48,7 +48,11 @@ ** ****************************************************************************/ -#include <QtGui> +#include <QtWidgets> +#include <QtPrintSupport/qtprintsupportglobal.h> +#if QT_CONFIG(printdialog) +#include <QPrinter> +#endif int main(int argc, char **argv) { |