File quiterss-fix_webkit.patch of Package quiterss

Overview Repositories Revisions Requests Users Attributes Meta

File quiterss-fix_webkit.patch of Package quiterss

From cf2e6b384b858e9d3243f0f3d6ec47ed0f267280 Mon Sep 17 00:00:00 2001
From: Shilyaev Egor <egor.shilyaev@gmail.com>
Date: Tue, 21 Apr 2020 20:55:22 +0500
Subject: [PATCH] =?UTF-8?q?change:=20Webkit.=20=D0=97=D0=B0=D0=BF=D1=80?=
 =?UTF-8?q?=D0=B5=D1=82=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80=D0=B0=D0=B6=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D1=81=D1=82=D1=80=D0=B0=D0=BD=D0=B8=D1=86?=
 =?UTF-8?q?=D1=8B=20=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B8=20(=D1=82=D0=BE?=
 =?UTF-8?q?=D0=BB=D1=8C=D0=BA=D0=BE=20=D0=B4=D0=BB=D1=8F=20Webkit=20alpha4?=
 =?UTF-8?q?)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 QuiteRSS.pro                   | 3 +++
 src/application/mainwindow.cpp | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/QuiteRSS.pro b/QuiteRSS.pro
index de056662..d5088fdf 100644
--- a/QuiteRSS.pro
+++ b/QuiteRSS.pro
@@ -34,6 +34,9 @@ exists(.git) {
 isEqual(QT_MAJOR_VERSION, 5) {
   QT += widgets webkitwidgets network xml printsupport sql multimedia
   DEFINES += HAVE_QT5
+  equals(WEBKIT_ALPHA, true) {
+      DEFINES += WEBKIT_ALPHA
+  }
 } else {
   QT += core gui network xml webkit sql
   os2 {
diff --git a/src/application/mainwindow.cpp b/src/application/mainwindow.cpp
index d574cf38..f14c7805 100755
--- a/src/application/mainwindow.cpp
+++ b/src/application/mainwindow.cpp
@@ -2096,7 +2096,7 @@ void MainWindow::loadSettings()
   QWebSettings::globalSettings()->setAttribute(
         QWebSettings::PluginsEnabled, pluginsEnable_);
   QWebSettings::globalSettings()->setMaximumPagesInCache(maxPagesInCache_);
-#if QT_VERSION >= 0x050e00
+#ifdef WEBKIT_ALPHA
   QWebSettings::globalSettings()->setAttribute(
         QWebSettings::ErrorPageEnabled, false);
 #endif

Places

File quiterss-fix_webkit.patch of Package quiterss

Places