Allow compiling without print support

m-kuhn · m-kuhn · commit aa646884fb85 · 2016-12-20T01:20:08.000+01:00
diff --git a/src/core/composer/qgscomposition.cpp b/src/core/composer/qgscomposition.cpp
@@ -2777,6 +2777,8 @@ void QgsComposition::deleteAndRemoveMultiFrames()
   mMultiFrames.clear();
 }
 
+#ifndef QT_NO_PRINTER
+
 void QgsComposition::beginPrintAsPDF( QPrinter& printer, const QString& file )
 {
   printer.setOutputFileName( file );
@@ -2808,6 +2810,8 @@ bool QgsComposition::exportAsPDF( const QString& file )
   return print( printer );
 }
 
+#endif
+
 void QgsComposition::georeferenceOutput( const QString& file, QgsComposerMap* map,
     const QRectF& exportRegion, double dpi ) const
 {
@@ -2836,6 +2840,8 @@ void QgsComposition::georeferenceOutput( const QString& file, QgsComposerMap* ma
   delete[] t;
 }
 
+#ifndef QT_NO_PRINTER
+
 void QgsComposition::doPrint( QPrinter& printer, QPainter& p, bool startNewPage )
 {
   if ( ddPageSizeActive() )
@@ -2929,6 +2935,8 @@ bool QgsComposition::print( QPrinter &printer, const bool evaluateDDPageSize )
   return true;
 }
 
+#endif
+
 QImage QgsComposition::printPageAsRaster( int page, QSize imageSize, int dpi )
 {
   int resolution = mPrintResolution;
diff --git a/src/core/composer/qgscomposition.h b/src/core/composer/qgscomposition.h
@@ -608,8 +608,8 @@ class CORE_EXPORT QgsComposition : public QGraphicsScene, public QgsExpressionCo
     void setPreventCursorChange( const bool preventChange ) { mPreventCursorChange = preventChange; }
     bool preventCursorChange() const { return mPreventCursorChange; }
 
+#ifndef QT_NO_PRINTER
     //printing
-
     //! Prepare the printer for printing
     void beginPrint( QPrinter& printer, const bool evaluateDDPageSize = false );
     //! Prepare the printer for printing in a PDF
@@ -631,6 +631,7 @@ class CORE_EXPORT QgsComposition : public QGraphicsScene, public QgsExpressionCo
      * @returns true if export was successful
      */
     bool exportAsPDF( const QString& file );
+#endif
 
     /** Renders a composer page to an image.
      * @param page page number, 0 based such that the first page is page 0
diff --git a/src/core/qgsprojectfiletransform.cpp b/src/core/qgsprojectfiletransform.cpp
@@ -268,6 +268,7 @@ void QgsProjectFileTransform::transform0100to0110()
 {
   if ( ! mDom.isNull() )
   {
+#ifndef QT_NO_PRINTER
     //Change 'outlinewidth' in QgsSymbol
     QPrinter myPrinter( QPrinter::ScreenResolution );
     int screenDpi = myPrinter.resolution();
@@ -302,6 +303,7 @@ void QgsProjectFileTransform::transform0100to0110()
       QDomText newPointSizeText = mDom.createTextNode( QString::number( static_cast< int >( pointSize ) ) );
       currentPointSizeElem.replaceChild( newPointSizeText, pointSizeTextNode );
     }
+#endif
   }
 }
 
diff --git a/src/core/qgswebview.h b/src/core/qgswebview.h
@@ -18,12 +18,12 @@
 
 
 #include <QWidget>
-#include <QPrinter>
 
 #ifdef WITH_QTWEBKIT
 #include <QWebView>
 #include <QDesktopWidget>
 
+
 /** \ingroup core
  */
 class CORE_EXPORT QgsWebView : public QWebView
@@ -45,6 +45,8 @@ class CORE_EXPORT QgsWebView : public QWebView
 #else
 #include "qgswebpage.h"
 #include <QTextBrowser>
+class QPrinter;
+
 
 /** \ingroup core
  * @brief The QgsWebView class is a collection of stubs to mimic the API of QWebView on systems where the real
diff --git a/src/core/raster/qgsrasterdrawer.cpp b/src/core/raster/qgsrasterdrawer.cpp
@@ -66,6 +66,7 @@ void QgsRasterDrawer::draw( QPainter* p, QgsRasterViewPort* viewPort, const QgsM
 
     QImage img = block->image();
 
+#ifndef QT_NO_PRINTER
     // Because of bug in Acrobat Reader we must use "white" transparent color instead
     // of "black" for PDF. See #9101.
     QPrinter *printer = dynamic_cast<QPrinter *>( p->device() );
@@ -87,6 +88,7 @@ void QgsRasterDrawer::draw( QPainter* p, QgsRasterViewPort* viewPort, const QgsM
         }
       }
     }
+#endif
 
     if ( feedback && feedback->renderPartialOutput() )
     {

Original file line number	Diff line number	Diff line change
`@@ -2777,6 +2777,8 @@ void QgsComposition::deleteAndRemoveMultiFrames()`
`2777`	`2777`	`mMultiFrames.clear();`
`2778`	`2778`	`}`
`2779`	`2779`
	`2780`	`+#ifndef QT_NO_PRINTER`
	`2781`	`+`
`2780`	`2782`	`void QgsComposition::beginPrintAsPDF( QPrinter& printer, const QString& file )`
`2781`	`2783`	`{`
`2782`	`2784`	`printer.setOutputFileName( file );`
`@@ -2808,6 +2810,8 @@ bool QgsComposition::exportAsPDF( const QString& file )`
`2808`	`2810`	`return print( printer );`
`2809`	`2811`	`}`
`2810`	`2812`
	`2813`	`+#endif`
	`2814`	`+`
`2811`	`2815`	`void QgsComposition::georeferenceOutput( const QString& file, QgsComposerMap* map,`
`2812`	`2816`	`const QRectF& exportRegion, double dpi ) const`
`2813`	`2817`	`{`
`@@ -2836,6 +2840,8 @@ void QgsComposition::georeferenceOutput( const QString& file, QgsComposerMap* ma`
`2836`	`2840`	`delete[] t;`
`2837`	`2841`	`}`
`2838`	`2842`
	`2843`	`+#ifndef QT_NO_PRINTER`
	`2844`	`+`
`2839`	`2845`	`void QgsComposition::doPrint( QPrinter& printer, QPainter& p, bool startNewPage )`
`2840`	`2846`	`{`
`2841`	`2847`	`if ( ddPageSizeActive() )`
`@@ -2929,6 +2935,8 @@ bool QgsComposition::print( QPrinter &printer, const bool evaluateDDPageSize )`
`2929`	`2935`	`return true;`
`2930`	`2936`	`}`
`2931`	`2937`
	`2938`	`+#endif`
	`2939`	`+`
`2932`	`2940`	`QImage QgsComposition::printPageAsRaster( int page, QSize imageSize, int dpi )`
`2933`	`2941`	`{`
`2934`	`2942`	`int resolution = mPrintResolution;`
Original file line number	Diff line number	Diff line change
`@@ -268,6 +268,7 @@ void QgsProjectFileTransform::transform0100to0110()`
`268`	`268`	`{`
`269`	`269`	`if ( ! mDom.isNull() )`
`270`	`270`	`{`
	`271`	`+#ifndef QT_NO_PRINTER`
`271`	`272`	`//Change 'outlinewidth' in QgsSymbol`
`272`	`273`	`QPrinter myPrinter( QPrinter::ScreenResolution );`
`273`	`274`	`int screenDpi = myPrinter.resolution();`
`@@ -302,6 +303,7 @@ void QgsProjectFileTransform::transform0100to0110()`
`302`	`303`	`QDomText newPointSizeText = mDom.createTextNode( QString::number( static_cast< int >( pointSize ) ) );`
`303`	`304`	`currentPointSizeElem.replaceChild( newPointSizeText, pointSizeTextNode );`
`304`	`305`	`}`
	`306`	`+#endif`
`305`	`307`	`}`
`306`	`308`	`}`
`307`	`309`
Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,7 @@ void QgsRasterDrawer::draw( QPainter* p, QgsRasterViewPort* viewPort, const QgsM`
`66`	`66`
`67`	`67`	`QImage img = block->image();`
`68`	`68`
	`69`	`+#ifndef QT_NO_PRINTER`
`69`	`70`	`// Because of bug in Acrobat Reader we must use "white" transparent color instead`
`70`	`71`	`// of "black" for PDF. See #9101.`
`71`	`72`	`QPrinter printer = dynamic_cast<QPrinter >( p->device() );`
`@@ -87,6 +88,7 @@ void QgsRasterDrawer::draw( QPainter* p, QgsRasterViewPort* viewPort, const QgsM`
`87`	`88`	`}`
`88`	`89`	`}`
`89`	`90`	`}`
	`91`	`+#endif`
`90`	`92`
`91`	`93`	`if ( feedback && feedback->renderPartialOutput() )`
`92`	`94`	`{`