diff options
| author | Liang Qi <liang.qi@qt.io> | 2017-06-07 12:05:33 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2017-06-07 14:02:43 +0200 |
| commit | 7cbee5629604aa49c618829c8e3e55fc64e94df7 (patch) | |
| tree | d12041105160c1cb21226b365edb9653d87b5853 /examples/widgets/mainwindows | |
| parent | e400b7e326c554ccd819448866265953d2a0f24d (diff) | |
| parent | 5f0ce2333f7e11a3ffb5d16a27cd9303efa712d5 (diff) | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
src/widgets/widgets/qmenu.cpp
Change-Id: I6d3baf56eb24501cddb129a3cb6b958ccc25a308
Diffstat (limited to 'examples/widgets/mainwindows')
| -rw-r--r-- | examples/widgets/mainwindows/dockwidgets/mainwindow.cpp | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/examples/widgets/mainwindows/dockwidgets/mainwindow.cpp b/examples/widgets/mainwindows/dockwidgets/mainwindow.cpp index eb5864c818..47a6e78265 100644 --- a/examples/widgets/mainwindows/dockwidgets/mainwindow.cpp +++ b/examples/widgets/mainwindows/dockwidgets/mainwindow.cpp @@ -50,9 +50,12 @@ //! [0] #include <QtWidgets> -#ifndef QT_NO_PRINTDIALOG +#if defined(QT_PRINTSUPPORT_LIB) +#include <QtPrintSupport/qtprintsupportglobal.h> +#if QT_CONFIG(printdialog) #include <QtPrintSupport> #endif +#endif #include "mainwindow.h" //! [0] @@ -125,7 +128,7 @@ void MainWindow::newLetter() //! [3] void MainWindow::print() { -#ifndef QT_NO_PRINTDIALOG +#if QT_CONFIG(printdialog) QTextDocument *document = textEdit->document(); QPrinter printer; |