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 <paul.tvete@digia.com>

diff --git a/src/assistant/assistant/centralwidget.cpp b/src/assistant/assistant/centralwidget.cpp
index ccab203..c3541af 100644 (file)
--- 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 (file)
--- 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;