rpms
/
qt5-qtwebengine
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

page-margins patch: Fix build (s/printSettings/print_settings/g)

This commit is contained in:
Kevin Kofler 2016-09-09 05:05:28 +02:00
parent bda84512e3
commit 28117fc600
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
qtwebengine-opensource-src-5.7.0-page-margins.patch
View File

@ -1,4 +1,4 @@
From e4305a681eb3b8e21f028627df8bed10d7071676 Mon Sep 17 00:00:00 2001
From fbf32f1208e6d6556779ac955825ff7b6bf6a807 Mon Sep 17 00:00:00 2001
From: Kevin Kofler <kevin.kofler@chello.at>
Date: Fri, 9 Sep 2016 03:20:17 +0200
Subject: [PATCH] Apply the correct page margins from the QPageLayout to
@ -15,7 +15,7 @@ to only the margin fix.
1 file changed, 10 insertions(+)
diff --git a/src/core/print_view_manager_qt.cpp b/src/core/print_view_manager_qt.cpp
index 4cb0e06..0db1df4 100644
index 4cb0e06..b773c24 100644
--- a/src/core/print_view_manager_qt.cpp
+++ b/src/core/print_view_manager_qt.cpp
@@ -115,6 +115,16 @@ static void applyQPageLayoutSettingsToDictionary(const QPageLayout& pageLayout,
@ -29,8 +29,8 @@ index 4cb0e06..0db1df4 100644
+ marginsDict->SetInteger(printing::kSettingMarginBottom, pageMarginsInPoints.bottom());
+ marginsDict->SetInteger(printing::kSettingMarginLeft, pageMarginsInPoints.left());
+ marginsDict->SetInteger(printing::kSettingMarginRight, pageMarginsInPoints.right());
+ printSettings.Set(printing::kSettingMarginsCustom, std::move(marginsDict));
+ printSettings.SetInteger(printing::kSettingMarginsType, printing::CUSTOM_MARGINS);
+ print_settings.Set(printing::kSettingMarginsCustom, std::move(marginsDict));
+ print_settings.SetInteger(printing::kSettingMarginsType, printing::CUSTOM_MARGINS);
+
print_settings.SetBoolean(printing::kSettingLandscape, pageLayout.orientation() == QPageLayout::Landscape);