Merge remote-tracking branch 'origin/stable' into dev

Conflicts:
	src/gui/image/qjpeghandler.cpp

Change-Id: I9db3acea7d5c82f5da679c8eaeb29431136665f0

1 files changed, 6 insertions, 10 deletions

diff --git a/src/plugins/printsupport/cups/qcupsprintengine_p.h b/src/plugins/printsupport/cups/qcupsprintengine_p.h
index db947a0232..393fef42a3 100644
--- a/src/plugins/printsupport/cups/qcupsprintengine_p.h
+++ b/src/plugins/printsupport/cups/qcupsprintengine_p.h
@@ -61,9 +61,8 @@
 #include <QtGui/qpaintengine.h>
 
 #include <private/qpaintengine_p.h>
+#include <private/qprintdevice_p.h>
 #include <private/qprintengine_pdf_p.h>
-#include <QtPrintSupport/qprintengine.h>
-#include <private/qcups_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -95,18 +94,15 @@ public:
     bool openPrintDevice();
     void closePrintDevice();
 
-    void updatePaperSize();
-    void setPaperSize();
-    void setPaperName();
-    void setCupsDefaults();
-
 private:
     Q_DISABLE_COPY(QCupsPrintEnginePrivate)
 
+    void setupDefaultPrinter();
+    void changePrinter(const QString &newPrinter);
+    void setPageSize(const QPageSize &pageSize);
+
+    QPrintDevice m_printDevice;
     QStringList cupsOptions;
-    QString cupsStringPageSize;
-    QRect cupsPaperRect;
-    QRect cupsPageRect;
     QString cupsTempFile;
 };