Fix building of qtbase examples when printsupport module is disabled.

Printsupport module is not that interesting in embedded environments,
and it also does not compile at the moment for WEC7. Fixed qtbase
examples to obey the availability of printsupport module.

Change-Id: I960d1b628b9ca82450aa3b0df8dd101b2544ee12
Reviewed-by: Björn Breitmeyer <bjoern.breitmeyer@kdab.com>
Reviewed-by: Andreas Holzammer <andreas.holzammer@kdab.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>

22 files changed, 49 insertions, 15 deletions

diff --git a/examples/graphicsview/chip/chip.pro b/examples/graphicsview/chip/chip.pro
index 94a461a99e..afe748946e 100644
--- a/examples/graphicsview/chip/chip.pro
+++ b/examples/graphicsview/chip/chip.pro
@@ -4,7 +4,8 @@ HEADERS += mainwindow.h view.h chip.h
 SOURCES += main.cpp
 SOURCES += mainwindow.cpp view.cpp chip.cpp
 
-QT += widgets printsupport
+QT += widgets
+!isEmpty(QT.printsupport.name): QT += printsupport
 contains(QT_CONFIG, opengl):QT += opengl
 
 build_all:!build_pass {
diff --git a/examples/graphicsview/chip/view.cpp b/examples/graphicsview/chip/view.cpp
index ce8aff9a83..b755b8eadd 100644
--- a/examples/graphicsview/chip/view.cpp
+++ b/examples/graphicsview/chip/view.cpp
@@ -42,13 +42,13 @@
 #include "view.h"
 
 #include <QtWidgets>
+#ifndef QT_NO_PRINTER
 #include <QPrinter>
 #include <QPrintDialog>
-
+#endif
 #ifndef QT_NO_OPENGL
 #include <QtOpenGL>
 #endif
-
 #include <qmath.h>
 
 void GraphicsView::wheelEvent(QWheelEvent *e)
diff --git a/examples/itemviews/pixelator/mainwindow.cpp b/examples/itemviews/pixelator/mainwindow.cpp
index 4d83a4d57f..20dfba18f4 100644
--- a/examples/itemviews/pixelator/mainwindow.cpp
+++ b/examples/itemviews/pixelator/mainwindow.cpp
@@ -39,8 +39,10 @@
 ****************************************************************************/
 
 #include <QtWidgets>
+#ifndef QT_NO_PRINTER
 #include <QPrinter>
 #include <QPrintDialog>
+#endif
 
 #include "imagemodel.h"
 #include "mainwindow.h"
diff --git a/examples/itemviews/pixelator/pixelator.pro b/examples/itemviews/pixelator/pixelator.pro
index 7a482a1d31..48f8a58a58 100644
--- a/examples/itemviews/pixelator/pixelator.pro
+++ b/examples/itemviews/pixelator/pixelator.pro
@@ -13,4 +13,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro images
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/itemviews/pixelator
 INSTALLS += target sources
 
-QT += widgets printsupport
+QT += widgets
+!isEmpty(QT.printsupport.name): QT += printsupport
diff --git a/examples/itemviews/spreadsheet/printview.cpp b/examples/itemviews/spreadsheet/printview.cpp
index 2089dd82b1..fe94fde63c 100644
--- a/examples/itemviews/spreadsheet/printview.cpp
+++ b/examples/itemviews/spreadsheet/printview.cpp
@@ -40,7 +40,10 @@
 ****************************************************************************/
 
 #include "printview.h"
+
+#ifndef QT_NO_PRINTER
 #include <QPrinter>
+#endif
 #include <QStyleOptionViewItem>
 
 PrintView::PrintView()
diff --git a/examples/itemviews/spreadsheet/spreadsheet.cpp b/examples/itemviews/spreadsheet/spreadsheet.cpp
index 5d3e33ce57..5dff7dc059 100644
--- a/examples/itemviews/spreadsheet/spreadsheet.cpp
+++ b/examples/itemviews/spreadsheet/spreadsheet.cpp
@@ -40,9 +40,11 @@
 ****************************************************************************/
 
 #include <QtWidgets>
+#ifndef QT_NO_PRINTER
 #include <QPrinter>
 #include <QPrintDialog>
 #include <QPrintPreviewDialog>
+#endif
 
 #include "spreadsheet.h"
 #include "spreadsheetdelegate.h"
diff --git a/examples/itemviews/spreadsheet/spreadsheet.pro b/examples/itemviews/spreadsheet/spreadsheet.pro
index 93fc5e95c6..48fd07e7fd 100644
--- a/examples/itemviews/spreadsheet/spreadsheet.pro
+++ b/examples/itemviews/spreadsheet/spreadsheet.pro
@@ -1,4 +1,5 @@
-QT += widgets printsupport
+QT += widgets
+!isEmpty(QT.printsupport.name): QT += printsupport
 #unix:contains(QT_CONFIG, dbus):QT += dbus widgets
 
 HEADERS += printview.h spreadsheet.h spreadsheetdelegate.h spreadsheetitem.h
diff --git a/examples/mainwindows/dockwidgets/dockwidgets.pro b/examples/mainwindows/dockwidgets/dockwidgets.pro
index 42eab88010..7e0da2496e 100644
--- a/examples/mainwindows/dockwidgets/dockwidgets.pro
+++ b/examples/mainwindows/dockwidgets/dockwidgets.pro
@@ -9,6 +9,7 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES dockwidgets.pro images
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/mainwindows/dockwidgets
 INSTALLS += target sources
 
-QT += widgets printsupport
+QT += widgets
+!isEmpty(QT.printsupport.name): QT += printsupport
 
 simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/mainwindows/dockwidgets/mainwindow.cpp b/examples/mainwindows/dockwidgets/mainwindow.cpp
index 9f1a09c7d5..da01d56502 100644
--- a/examples/mainwindows/dockwidgets/mainwindow.cpp
+++ b/examples/mainwindows/dockwidgets/mainwindow.cpp
@@ -40,7 +40,10 @@
 
 //! [0]
 #include <QtWidgets>
+#ifndef QT_NO_PRINTDIALOG
 #include <QtPrintSupport>
+#endif
+
 #include "mainwindow.h"
 //! [0]
 
diff --git a/examples/painting/fontsampler/fontsampler.pro b/examples/painting/fontsampler/fontsampler.pro
index 539fc4894b..b918c51837 100644
--- a/examples/painting/fontsampler/fontsampler.pro
+++ b/examples/painting/fontsampler/fontsampler.pro
@@ -9,4 +9,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS fontsampler.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/painting/fontsampler
 INSTALLS += target sources
 
-QT += widgets printsupport
+QT += widgets
+!isEmpty(QT.printsupport.name): QT += printsupport
diff --git a/examples/painting/fontsampler/mainwindow.cpp b/examples/painting/fontsampler/mainwindow.cpp
index c2d97f360e..ae45613abf 100644
--- a/examples/painting/fontsampler/mainwindow.cpp
+++ b/examples/painting/fontsampler/mainwindow.cpp
@@ -39,9 +39,11 @@
 ****************************************************************************/
 
 #include <QtWidgets>
+#ifndef QT_NO_PRINTER
 #include <QPrinter>
 #include <QPrintDialog>
 #include <QPrintPreviewDialog>
+#endif
 
 #include "mainwindow.h"
 
diff --git a/examples/richtext/orderform/mainwindow.cpp b/examples/richtext/orderform/mainwindow.cpp
index f241d50810..44b3cb4f9a 100644
--- a/examples/richtext/orderform/mainwindow.cpp
+++ b/examples/richtext/orderform/mainwindow.cpp
@@ -39,8 +39,10 @@
 ****************************************************************************/
 
 #include <QtWidgets>
+#ifndef QT_NO_PRINTER
 #include <QPrinter>
 #include <QPrintDialog>
+#endif
 
 #include "detailsdialog.h"
 #include "mainwindow.h"
diff --git a/examples/richtext/orderform/orderform.pro b/examples/richtext/orderform/orderform.pro
index 999b55cb96..4aefb99428 100644
--- a/examples/richtext/orderform/orderform.pro
+++ b/examples/richtext/orderform/orderform.pro
@@ -10,4 +10,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS orderform.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/richtext/orderform
 INSTALLS += target sources
 
-QT += widgets printsupport
+QT += widgets
+!isEmpty(QT.printsupport.name): QT += printsupport
diff --git a/examples/richtext/textedit/textedit.cpp b/examples/richtext/textedit/textedit.cpp
index 1a1eb9b19c..0be60230ca 100644
--- a/examples/richtext/textedit/textedit.cpp
+++ b/examples/richtext/textedit/textedit.cpp
@@ -53,8 +53,6 @@
 #include <QFontDatabase>
 #include <QMenu>
 #include <QMenuBar>
-#include <QPrintDialog>
-#include <QPrinter>
 #include <QTextCodec>
 #include <QTextEdit>
 #include <QToolBar>
@@ -64,8 +62,12 @@
 #include <QtDebug>
 #include <QCloseEvent>
 #include <QMessageBox>
-#include <QPrintPreviewDialog>
 #include <QMimeData>
+#ifndef QT_NO_PRINTER
+#include <QPrintDialog>
+#include <QPrinter>
+#include <QPrintPreviewDialog>
+#endif
 
 #ifdef Q_OS_MAC
 const QString rsrcPath = ":/images/mac";
diff --git a/examples/richtext/textedit/textedit.pro b/examples/richtext/textedit/textedit.pro
index ffbf9a7222..e172e79fe6 100644
--- a/examples/richtext/textedit/textedit.pro
+++ b/examples/richtext/textedit/textedit.pro
@@ -19,4 +19,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES *.pro *.html *.doc images
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/richtext/textedit
 INSTALLS += target sources
 
-QT += widgets printsupport
+QT += widgets
+!isEmpty(QT.printsupport.name): QT += printsupport
diff --git a/examples/touch/fingerpaint/fingerpaint.pro b/examples/touch/fingerpaint/fingerpaint.pro
index dc9e84696d..4a17ed91b3 100644
--- a/examples/touch/fingerpaint/fingerpaint.pro
+++ b/examples/touch/fingerpaint/fingerpaint.pro
@@ -9,7 +9,8 @@ target.path = $$[QT_INSTALL_EXAMPLES]/qtbase/touch/fingerpaint
 sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS fingerpaint.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/touch/fingerpaint
 INSTALLS += target sources
-QT += widgets printsupport
 
+QT += widgets
+!isEmpty(QT.printsupport.name): QT += printsupport
 
 simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/touch/fingerpaint/scribblearea.cpp b/examples/touch/fingerpaint/scribblearea.cpp
index 5b32980ee2..8e11d980fb 100644
--- a/examples/touch/fingerpaint/scribblearea.cpp
+++ b/examples/touch/fingerpaint/scribblearea.cpp
@@ -39,8 +39,10 @@
 ****************************************************************************/
 
 #include <QtWidgets>
+#ifndef QT_NO_PRINTER
 #include <QPrinter>
 #include <QPrintDialog>
+#endif
 
 #include "scribblearea.h"
 
diff --git a/examples/widgets/imageviewer/imageviewer.cpp b/examples/widgets/imageviewer/imageviewer.cpp
index e0683e8acb..97ab1d77f8 100644
--- a/examples/widgets/imageviewer/imageviewer.cpp
+++ b/examples/widgets/imageviewer/imageviewer.cpp
@@ -39,7 +39,9 @@
 ****************************************************************************/
 
 #include <QtWidgets>
+#ifndef QT_NO_PRINTER
 #include <QPrintDialog>
+#endif
 
 #include "imageviewer.h"
 
diff --git a/examples/widgets/imageviewer/imageviewer.h b/examples/widgets/imageviewer/imageviewer.h
index 293946ea56..98300794a2 100644
--- a/examples/widgets/imageviewer/imageviewer.h
+++ b/examples/widgets/imageviewer/imageviewer.h
@@ -42,7 +42,9 @@
 #define IMAGEVIEWER_H
 
 #include <QMainWindow>
+#ifndef QT_NO_PRINTER
 #include <QPrinter>
+#endif
 
 QT_BEGIN_NAMESPACE
 class QAction;
diff --git a/examples/widgets/imageviewer/imageviewer.pro b/examples/widgets/imageviewer/imageviewer.pro
index a8d92a6b18..15751ff3d9 100644
--- a/examples/widgets/imageviewer/imageviewer.pro
+++ b/examples/widgets/imageviewer/imageviewer.pro
@@ -12,6 +12,7 @@ INSTALLS += target sources
 wince*: {
    DEPLOYMENT_PLUGIN += qjpeg qgif
 }
-QT += widgets printsupport
+QT += widgets
+!isEmpty(QT.printsupport.name): QT += printsupport
 
 simulator: warning(This example might not fully work on Simulator platform)
diff --git a/examples/widgets/scribble/scribble.pro b/examples/widgets/scribble/scribble.pro
index 1bccb9be62..9c6e3cb100 100644
--- a/examples/widgets/scribble/scribble.pro
+++ b/examples/widgets/scribble/scribble.pro
@@ -10,4 +10,5 @@ sources.files = $$SOURCES $$HEADERS $$RESOURCES $$FORMS scribble.pro
 sources.path = $$[QT_INSTALL_EXAMPLES]/qtbase/widgets/scribble
 INSTALLS += target sources
 
-QT += widgets printsupport
+QT += widgets
+!isEmpty(QT.printsupport.name): QT += printsupport
diff --git a/examples/widgets/scribble/scribblearea.cpp b/examples/widgets/scribble/scribblearea.cpp
index 281ee3facd..ab527e1d63 100644
--- a/examples/widgets/scribble/scribblearea.cpp
+++ b/examples/widgets/scribble/scribblearea.cpp
@@ -39,8 +39,10 @@
 ****************************************************************************/
 
 #include <QtWidgets>
+#ifndef QT_NO_PRINTER
 #include <QPrinter>
 #include <QPrintDialog>
+#endif
 
 #include "scribblearea.h"