From 7c7bd44669babe5eb9cbc0b803d43e8e2cf0518b Mon Sep 17 00:00:00 2001
From: Oliver Wolff <oliver.wolff@qt.io>
Date: Thu, 5 Mar 2020 10:06:24 +0100
Subject: examples: Fix build for configurations that do not have printsupport

printsupport features are only available if the module is available for
the configuration. Every printer feature check has to be coupled with a
check for the module itself.

Change-Id: Id2ca84e71d5d74463d0ff35e8b18b252a779a883
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
---
 examples/widgets/itemviews/spreadsheet/printview.cpp   | 12 +++++++++---
 examples/widgets/itemviews/spreadsheet/spreadsheet.cpp |  2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'examples/widgets/itemviews')

diff --git a/examples/widgets/itemviews/spreadsheet/printview.cpp b/examples/widgets/itemviews/spreadsheet/printview.cpp
index 7db1a6bad9..7700b4ed6a 100644
--- a/examples/widgets/itemviews/spreadsheet/printview.cpp
+++ b/examples/widgets/itemviews/spreadsheet/printview.cpp
@@ -50,8 +50,12 @@
 
 #include "printview.h"
 
-#ifndef QT_NO_PRINTER
-#include <QPrinter>
+#if defined(QT_PRINTSUPPORT_LIB)
+#  include <QtPrintSupport/qtprintsupportglobal.h>
+
+#  if QT_CONFIG(printer)
+#    include <QPrinter>
+#  endif
 #endif
 
 PrintView::PrintView()
@@ -62,9 +66,11 @@ PrintView::PrintView()
 
 void PrintView::print(QPrinter *printer)
 {
-#ifndef QT_NO_PRINTER
+#if defined(QT_PRINTSUPPORT_LIB) && QT_CONFIG(printer)
     resize(printer->width(), printer->height());
     render(printer);
+#else
+    Q_UNUSED(printer)
 #endif
 }
 
diff --git a/examples/widgets/itemviews/spreadsheet/spreadsheet.cpp b/examples/widgets/itemviews/spreadsheet/spreadsheet.cpp
index fc7fbb872c..ac8ea7d437 100644
--- a/examples/widgets/itemviews/spreadsheet/spreadsheet.cpp
+++ b/examples/widgets/itemviews/spreadsheet/spreadsheet.cpp
@@ -638,7 +638,7 @@ QString encode_pos(int row, int col)
 
 void SpreadSheet::print()
 {
-#if QT_CONFIG(printpreviewdialog)
+#if defined(QT_PRINTSUPPORT_LIB) && QT_CONFIG(printpreviewdialog)
     QPrinter printer(QPrinter::ScreenResolution);
     QPrintPreviewDialog dlg(&printer);
     PrintView view;
-- 
cgit v1.2.3