Merge remote-tracking branch 'origin/4.10'

 Conflicts:
	src/plugins/baremetal/iarewtoolchain.cpp

Change-Id: I483e81d7e920e724fb7cde84a8f6fa9bce4cd518

1 files changed, 2 insertions, 2 deletions

diff --git a/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodel.cpp b/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodel.cpp
index 182c251b5d3..82fba740a18 100644
--- a/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodel.cpp
+++ b/src/libs/modelinglib/qmt/diagram_scene/diagramscenemodel.cpp
@@ -470,10 +470,10 @@ bool DiagramSceneModel::exportPdf(const QString &fileName, bool selectedElements
     QSizeF pageSize = status.m_sceneBoundingRect.size();
     pageSize += QSizeF(2.0 * border, 2.0 * border);
     pageSize *= scaleFactor;
+    pageSize *= dotsPerMm;
 
     QPdfWriter pdfWriter(fileName);
-    pdfWriter.setPageSize(QPdfWriter::Custom);
-    pdfWriter.setPageSizeMM(pageSize * dotsPerMm);
+    pdfWriter.setPageSize(QPageSize(pageSize, QPageSize::Millimeter));
 
     QPainter pdfPainter;
     pdfPainter.begin(&pdfWriter);