From c3f6fcb0bfd4e66f77dbc9daee442fbd5dc7e003 Mon Sep 17 00:00:00 2001 From: Anton Lundin Date: Wed, 1 Jul 2015 17:08:35 +0200 Subject: Fix NO_PRINTING when printing is disabled in Qt Qt for android doesn't have any printing support, so this fixes NO_PRINTING so we can build against a Qt without any printing support at all. Signed-off-by: Anton Lundin Signed-off-by: Dirk Hohndel --- qt-ui/printdialog.cpp | 2 +- qt-ui/printdialog.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'qt-ui') diff --git a/qt-ui/printdialog.cpp b/qt-ui/printdialog.cpp index 4a3314691..6f30f89f5 100644 --- a/qt-ui/printdialog.cpp +++ b/qt-ui/printdialog.cpp @@ -2,6 +2,7 @@ #include "printoptions.h" #include "mainwindow.h" +#ifndef NO_PRINTING #include #include #include @@ -10,7 +11,6 @@ #define SETTINGS_GROUP "PrintDialog" -#ifndef NO_PRINTING PrintDialog::PrintDialog(QWidget *parent, Qt::WindowFlags f) : QDialog(parent, f) { // check if the options were previously stored in the settings; if not use some defaults. diff --git a/qt-ui/printdialog.h b/qt-ui/printdialog.h index 9937cd549..a34037442 100644 --- a/qt-ui/printdialog.h +++ b/qt-ui/printdialog.h @@ -1,12 +1,12 @@ #ifndef PRINTDIALOG_H #define PRINTDIALOG_H +#ifndef NO_PRINTING #include #include #include "printoptions.h" #include "printer.h" -#ifndef NO_PRINTING class QProgressBar; class PrintOptions; class PrintLayout; -- cgit v1.2.3-70-g09d2