diff options
author | Stephan Binner <stephan.binner@basyskom.com> | 2017-05-29 17:35:58 +0200 |
---|---|---|
committer | Stephan Binner <stephan.binner@basyskom.com> | 2017-05-30 17:21:26 +0000 |
commit | dbeb748de30bcc0e0615d21c593b761408404950 (patch) | |
tree | 63868dc50be0138424f82598daa81ded596bd26f /examples/widgets/itemviews | |
parent | f209215c0d96c8badcc14a3fc1cd8a6b0e56625c (diff) |
Convert features.printdialog to QT_[REQUIRE_]CONFIG
Change-Id: Ifb016ae2a0986b436f788b34513c81ea91f3804a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'examples/widgets/itemviews')
-rw-r--r-- | examples/widgets/itemviews/pixelator/mainwindow.cpp | 7 | ||||
-rw-r--r-- | examples/widgets/itemviews/spreadsheet/spreadsheet.cpp | 9 |
2 files changed, 12 insertions, 4 deletions
diff --git a/examples/widgets/itemviews/pixelator/mainwindow.cpp b/examples/widgets/itemviews/pixelator/mainwindow.cpp index 2a5b572344..63617f0169 100644 --- a/examples/widgets/itemviews/pixelator/mainwindow.cpp +++ b/examples/widgets/itemviews/pixelator/mainwindow.cpp @@ -53,10 +53,13 @@ #include "pixeldelegate.h" #include <QtWidgets> -#ifndef QT_NO_PRINTER +#if defined(QT_PRINTSUPPORT_LIB) +#include <QtPrintSupport/qtprintsupportglobal.h> +#if QT_CONFIG(printdialog) #include <QPrinter> #include <QPrintDialog> #endif +#endif //! [0] MainWindow::MainWindow() @@ -164,7 +167,7 @@ void MainWindow::openImage(const QString &fileName) void MainWindow::printImage() { -#if !defined(QT_NO_PRINTER) && !defined(QT_NO_PRINTDIALOG) +#if QT_CONFIG(printdialog) if (model->rowCount(QModelIndex())*model->columnCount(QModelIndex()) > 90000) { QMessageBox::StandardButton answer; answer = QMessageBox::question(this, tr("Large Image Size"), diff --git a/examples/widgets/itemviews/spreadsheet/spreadsheet.cpp b/examples/widgets/itemviews/spreadsheet/spreadsheet.cpp index e894d7fbd4..621f655b02 100644 --- a/examples/widgets/itemviews/spreadsheet/spreadsheet.cpp +++ b/examples/widgets/itemviews/spreadsheet/spreadsheet.cpp @@ -49,11 +49,16 @@ ****************************************************************************/ #include <QtWidgets> -#ifndef QT_NO_PRINTER +#if defined(QT_PRINTSUPPORT_LIB) +#include <QtPrintSupport/qtprintsupportglobal.h> +#if QT_CONFIG(printdialog) #include <QPrinter> #include <QPrintDialog> +#endif +#if QT_CONFIG(printpreviewdialog) #include <QPrintPreviewDialog> #endif +#endif #include "spreadsheet.h" #include "spreadsheetdelegate.h" @@ -637,7 +642,7 @@ QString encode_pos(int row, int col) void SpreadSheet::print() { -#if !defined(QT_NO_PRINTER) && !defined(QT_NO_PRINTDIALOG) +#if QT_CONFIG(printpreviewdialog) QPrinter printer(QPrinter::ScreenResolution); QPrintPreviewDialog dlg(&printer); PrintView view; |