diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-12-16 15:21:35 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2016-12-16 16:38:33 +0100 |
| commit | b13150336174083962d90922761fd96f07e173b4 (patch) | |
| tree | 1655e9009efba21b008d7d2f810aacbde3e2c2d8 /examples/widgets/painting/fontsampler/mainwindow.h | |
| parent | ff19ebcc2d9c9668af24fe8add9f70c160776367 (diff) | |
| parent | 9bfe3ab71e5291445e66be96d6cd1f63934a2d83 (diff) | |
Merge remote-tracking branch 'origin/5.8' into dev
Conflicts:
configure
configure.pri
examples/widgets/painting/fontsampler/mainwindow.cpp
examples/widgets/painting/fontsampler/mainwindow.h
mkspecs/features/moc.prf
src/corelib/global/qglobal.h
src/gui/text/qtextdocument.cpp
Change-Id: Ica65512e00871695190a14ccea5c275b0165f787
Diffstat (limited to 'examples/widgets/painting/fontsampler/mainwindow.h')
| -rw-r--r-- | examples/widgets/painting/fontsampler/mainwindow.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/examples/widgets/painting/fontsampler/mainwindow.h b/examples/widgets/painting/fontsampler/mainwindow.h index 6d73e84ea3..8f59e1021b 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,9 +77,9 @@ public: public slots: void on_clearAction_triggered(); void on_markAction_triggered(); + void on_unmarkAction_triggered(); void on_printAction_triggered(); void on_printPreviewAction_triggered(); - void on_unmarkAction_triggered(); void printDocument(QPrinter *printer); void printPage(int index, QPainter *painter, QPrinter *printer); void showFont(QTreeWidgetItem *item); |