From 89ce243149a36ea42a9b22ee0909bc1f0cc724a2 Mon Sep 17 00:00:00 2001 From: Sergio Ahumada Date: Fri, 26 Jul 2013 10:58:22 +0200 Subject: [PATCH] Fix compilation when QT_NO_PRINTDIALOG is defined Seems like QT_NO_PRINTER does not imply QT_NO_PRINTDIALOG, so both need to be checked. Change-Id: I164e602e75ebb524a33cfacaad68023e33f8978f Reviewed-by: Paul Olav Tvete --- src/assistant/assistant/centralwidget.cpp | 6 +++--- src/designer/src/designer/qdesigner_actions.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/assistant/assistant/centralwidget.cpp b/src/assistant/assistant/centralwidget.cpp index ccab203..c3541af 100644 --- a/src/assistant/assistant/centralwidget.cpp +++ b/src/assistant/assistant/centralwidget.cpp @@ -403,7 +403,7 @@ void CentralWidget::previousPage() void CentralWidget::print() { TRACE_OBJ -#ifndef QT_NO_PRINTER +#if !defined(QT_NO_PRINTER) && !defined(QT_NO_PRINTDIALOG) initPrinter(); QPrintDialog dlg(m_printer, this); @@ -420,7 +420,7 @@ void CentralWidget::print() void CentralWidget::pageSetup() { TRACE_OBJ -#ifndef QT_NO_PRINTER +#if !defined(QT_NO_PRINTER) && !defined(QT_NO_PRINTDIALOG) initPrinter(); QPageSetupDialog dlg(m_printer); dlg.exec(); @@ -430,7 +430,7 @@ void CentralWidget::pageSetup() void CentralWidget::printPreview() { TRACE_OBJ -#ifndef QT_NO_PRINTER +#if !defined(QT_NO_PRINTER) && !defined(QT_NO_PRINTDIALOG) initPrinter(); QPrintPreviewDialog preview(m_printer, this); connect(&preview, SIGNAL(paintRequested(QPrinter*)), diff --git a/src/designer/src/designer/qdesigner_actions.cpp b/src/designer/src/designer/qdesigner_actions.cpp index f8c042c..41aaa9a 100644 --- a/src/designer/src/designer/qdesigner_actions.cpp +++ b/src/designer/src/designer/qdesigner_actions.cpp @@ -1378,7 +1378,7 @@ void QDesignerActions::formWindowCountChanged() void QDesignerActions::printPreviewImage() { -#ifndef QT_NO_PRINTER +#if !defined(QT_NO_PRINTER) && !defined(QT_NO_PRINTDIALOG) QDesignerFormWindowInterface *fw = core()->formWindowManager()->activeFormWindow(); if (!fw) return; -- 2.7.4