diff options
| author | Christoph Schleifenbaum <christoph.schleifenbaum@kdab.com> | 2012-05-03 14:10:32 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-04 07:00:23 +0200 |
| commit | ee8eef9195f3c32b3365bbd54d56b53e682ae7d0 (patch) | |
| tree | 046f36098fb205e3369c9a692be0a73a3e35913d /src/gui | |
| parent | bb234e238c777b1a708912765d6899bf9061bcb8 (diff) | |
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>
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/painting/qpdf_p.h | 2 |
1 files changed, 0 insertions, 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 |