From f4a33e345eb658996e171daa6478fdc2ef62ff17 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@qt.io>
Date: Tue, 22 Nov 2016 13:59:35 +0100
Subject: Fix compilation on platforms that don't support printing

Task-number: QTBUG-56259
Change-Id: Ice1d7601494b01b387e787da412cd94b6717ebde
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
---
 examples/widgets/painting/fontsampler/mainwindow.cpp |  6 ++++--
 examples/widgets/painting/fontsampler/mainwindow.h   | 10 ++++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

(limited to 'examples')

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
-- 
cgit v1.2.3