Make cupsTempFile member unconditianol.
authorChristoph Schleifenbaum <christoph.schleifenbaum@kdab.com>
Thu, 3 May 2012 12:10:32 +0000 (14:10 +0200)
committerQt by Nokia <qt-info@nokia.com>
Fri, 4 May 2012 05:00:23 +0000 (07:00 +0200)
QPdfEngine has to have the same member everywhere. Otherwise
QPdfEngine and QPdfPrintEngine are compiled with different flags
(-DQT_NO_CUPS) -> QString cupsTempFile is only in QPdfEnginePrivate
in one lib -> crash.

Task-number: QTBUG-25553

Change-Id: I1d23bd14b8e68c212225ac773675a3b1bd2ca6cb
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
src/gui/painting/qpdf_p.h

index 7dd1386..b175b57 100644 (file)
@@ -283,9 +283,7 @@ public:
     QSizeF paperSize;
     qreal leftMargin, topMargin, rightMargin, bottomMargin;
 
-#if !defined(QT_NO_CUPS) && !defined(QT_NO_LIBRARY)
     QString cupsTempFile;
-#endif
 
 private:
 #ifdef USE_NATIVE_GRADIENTS