diff options
author | Paul Olav Tvete <paul.tvete@digia.com> | 2013-02-18 15:59:14 +0100 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-26 13:31:45 +0100 |
commit | 4b1332783e16423b3b2c54125b130247ee6bc5b2 (patch) | |
tree | 670a1384b261f621958a69ecaf76a1522746831d /examples/widgets/painting | |
parent | f6af0dad5be9aba5b0da5a8307a67334f044ec45 (diff) |
Compile fix when QT_NO_PRINTDIALOG is defined
...but QT_NO_PRINTER isn't.
Change-Id: I888c177cfdd2245eb55de766dfd93f6acd4293e9
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@digia.com>
Diffstat (limited to 'examples/widgets/painting')
-rw-r--r-- | examples/widgets/painting/fontsampler/mainwindow.cpp | 2 | ||||
-rw-r--r-- | examples/widgets/painting/fontsampler/mainwindow.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/examples/widgets/painting/fontsampler/mainwindow.cpp b/examples/widgets/painting/fontsampler/mainwindow.cpp index 645a2b1a9a..516ba5e2bc 100644 --- a/examples/widgets/painting/fontsampler/mainwindow.cpp +++ b/examples/widgets/painting/fontsampler/mainwindow.cpp @@ -241,7 +241,7 @@ QMap<QString, StyleItems> MainWindow::currentPageMap() return pageMap; } -#ifndef QT_NO_PRINTER +#if !defined(QT_NO_PRINTER) && !defined(QT_NO_PRINTDIALOG) void MainWindow::on_printAction_triggered() { pageMap = currentPageMap(); diff --git a/examples/widgets/painting/fontsampler/mainwindow.h b/examples/widgets/painting/fontsampler/mainwindow.h index f9e06c8b89..f4ad448480 100644 --- a/examples/widgets/painting/fontsampler/mainwindow.h +++ b/examples/widgets/painting/fontsampler/mainwindow.h @@ -62,12 +62,12 @@ public: public slots: void on_clearAction_triggered(); void on_markAction_triggered(); -#ifndef QT_NO_PRINTER +#if !defined(QT_NO_PRINTER) && !defined(QT_NO_PRINTDIALOG) void on_printAction_triggered(); void on_printPreviewAction_triggered(); #endif void on_unmarkAction_triggered(); -#ifndef QT_NO_PRINTER +#if !defined(QT_NO_PRINTER) && !defined(QT_NO_PRINTDIALOG) void printDocument(QPrinter *printer); void printPage(int index, QPainter *painter, QPrinter *printer); #endif |