[layouts] Attempted fix for direct printing page orientation issues

Seems the earlier hack may no longer be valid for Qt5. Fixes #18398, #18994, #19142, #19279
qgis · Jul 30, 2018 · a87a7b7 · a87a7b7
1 parent 40ce151
commit a87a7b7
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/src/core/layout/qgslayoutexporter.cpp b/src/core/layout/qgslayoutexporter.cpp
@@ -1106,11 +1106,9 @@ QgsLayoutExporter::ExportResult QgsLayoutExporter::printPrivate( QPrinter &print
 
 void QgsLayoutExporter::updatePrinterPageSize( QgsLayout *layout, QPrinter &printer, int page )
 {
-  //must set orientation to portrait before setting paper size, otherwise size will be flipped
-  //for landscape sized outputs (#11352)
-  printer.setOrientation( QPrinter::Portrait );
   QgsLayoutSize pageSize = layout->pageCollection()->page( page )->sizeWithUnits();
   QgsLayoutSize pageSizeMM = layout->renderContext().measurementConverter().convert( pageSize, QgsUnitTypes::LayoutMillimeters );
+  printer.setOrientation( layout->pageCollection()->page( page )->orientation() == QgsLayoutItemPage::Portrait ? QPrinter::Portrait : QPrinter::Landscape );
   printer.setPaperSize( pageSizeMM.toQSizeF(), QPrinter::Millimeter );
 }