From ee8eef9195f3c32b3365bbd54d56b53e682ae7d0 Mon Sep 17 00:00:00 2001
From: Christoph Schleifenbaum <christoph.schleifenbaum@kdab.com>
Date: Thu, 3 May 2012 14:10:32 +0200
Subject: [PATCH] Make cupsTempFile member unconditianol.

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 | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/gui/painting/qpdf_p.h b/src/gui/painting/qpdf_p.h
index 7dd1386ec6..b175b574bd 100644
--- a/src/gui/painting/qpdf_p.h
+++ b/src/gui/painting/qpdf_p.h
@@ -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