diff options
| author | Janne Anttila <janne.anttila@digia.com> | 2012-06-13 13:59:54 +0300 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-06-18 09:48:55 +0200 |
| commit | 9fe5139e73958a2102cd5bb754c5049d18812c89 (patch) | |
| tree | 4167c33c120f5f65ea1172dddb674ee001faa4cb /examples/itemviews | |
| parent | 15db02cb11ff070fa32f90862ce00a895e614cad (diff) | |
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>
Diffstat (limited to 'examples/itemviews')
| -rw-r--r-- | examples/itemviews/pixelator/mainwindow.cpp | 2 | ||||
| -rw-r--r-- | examples/itemviews/pixelator/pixelator.pro | 3 | ||||
| -rw-r--r-- | examples/itemviews/spreadsheet/printview.cpp | 3 | ||||
| -rw-r--r-- | examples/itemviews/spreadsheet/spreadsheet.cpp | 2 | ||||
| -rw-r--r-- | examples/itemviews/spreadsheet/spreadsheet.pro | 3 |
5 files changed, 11 insertions, 2 deletions
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 |