From 28117fc6000ec134ec65447f2de733a43a4d8b1d Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Fri, 9 Sep 2016 05:05:28 +0200 Subject: [PATCH] page-margins patch: Fix build (s/printSettings/print_settings/g) --- qtwebengine-opensource-src-5.7.0-page-margins.patch | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/qtwebengine-opensource-src-5.7.0-page-margins.patch b/qtwebengine-opensource-src-5.7.0-page-margins.patch index 634e412..17b05f1 100644 --- a/qtwebengine-opensource-src-5.7.0-page-margins.patch +++ b/qtwebengine-opensource-src-5.7.0-page-margins.patch @@ -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 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);