diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-12-16 09:38:46 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-12-16 09:45:16 +0100 |
| commit | 9bfe3ab71e5291445e66be96d6cd1f63934a2d83 (patch) | |
| tree | a3b5580d8788de658f39d5bdb23d84a447999bee /examples | |
| parent | 28dffdecdad4f3458b9aacec1a04803c7b5483a1 (diff) | |
| parent | 179045f36a16ce2f6cfaad1dbd9443b52b1bf8d3 (diff) | |
Merge remote-tracking branch 'origin/5.8.0' into 5.8
Conflicts:
doc/global/qt-cpp-defines.qdocconf
src/plugins/platforms/android/qandroidplatformopenglcontext.h
src/plugins/platforms/android/qandroidplatformtheme.h
Change-Id: I13d51cc66f708138ff4d667ceea7d515992e58a4
Diffstat (limited to 'examples')
| -rw-r--r-- | examples/widgets/painting/fontsampler/mainwindow.cpp | 6 | ||||
| -rw-r--r-- | examples/widgets/painting/fontsampler/mainwindow.h | 10 |
2 files changed, 10 insertions, 6 deletions
diff --git a/examples/widgets/painting/fontsampler/mainwindow.cpp b/examples/widgets/painting/fontsampler/mainwindow.cpp index 06ffac3728..88b23d5cfb 100644 --- a/examples/widgets/painting/fontsampler/mainwindow.cpp +++ b/examples/widgets/painting/fontsampler/mainwindow.cpp @@ -49,7 +49,9 @@ ****************************************************************************/ #include <QtWidgets> +#if defined(QT_PRINTSUPPORT_LIB) #include <QPrintPreviewDialog> +#endif #include "mainwindow.h" @@ -210,7 +212,7 @@ QMap<QString, StyleItems> MainWindow::currentPageMap() return pageMap; } -#if !defined(QT_NO_PRINTER) && !defined(QT_NO_PRINTDIALOG) +#if defined(QT_PRINTSUPPORT_LIB) && QT_CONFIG(printdialog) void MainWindow::on_printAction_triggered() { pageMap = currentPageMap(); @@ -342,4 +344,4 @@ void MainWindow::printPage(int index, QPainter *painter, QPrinter *printer) painter->restore(); } -#endif // QT_NO_PRINTER +#endif diff --git a/examples/widgets/painting/fontsampler/mainwindow.h b/examples/widgets/painting/fontsampler/mainwindow.h index ada0d47354..21e76f1a62 100644 --- a/examples/widgets/painting/fontsampler/mainwindow.h +++ b/examples/widgets/painting/fontsampler/mainwindow.h @@ -55,6 +55,9 @@ #include <QPrinter> #include <QPrintDialog> +#if defined(QT_PRINTSUPPORT_LIB) +#include <QtPrintSupport/qtprintsupportglobal.h> +#endif QT_BEGIN_NAMESPACE class QPrinter; class QTextEdit; @@ -74,12 +77,11 @@ public: public slots: void on_clearAction_triggered(); void on_markAction_triggered(); -#if !defined(QT_NO_PRINTER) && !defined(QT_NO_PRINTDIALOG) + void on_unmarkAction_triggered(); + +#if defined(QT_PRINTSUPPORT_LIB) && QT_CONFIG(printdialog) void on_printAction_triggered(); void on_printPreviewAction_triggered(); -#endif - void on_unmarkAction_triggered(); -#if !defined(QT_NO_PRINTER) && !defined(QT_NO_PRINTDIALOG) void printDocument(QPrinter *printer); void printPage(int index, QPainter *painter, QPrinter *printer); #endif |