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>
This commit is contained in:
parent
bb234e238c
commit
ee8eef9195
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user