From d429e90b1123b554688c49552db391882bd37038 Mon Sep 17 00:00:00 2001 From: Fredrik Johansson Date: Fri, 25 Jan 2019 21:39:00 +0100 Subject: [PATCH] Fix for Qt4 and QWebKit --- src/Mod/Web/Gui/BrowserView.cpp | 2 +- src/Mod/Web/Gui/CMakeLists.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Mod/Web/Gui/BrowserView.cpp b/src/Mod/Web/Gui/BrowserView.cpp index af9bd387ae..3ac1b30db5 100644 --- a/src/Mod/Web/Gui/BrowserView.cpp +++ b/src/Mod/Web/Gui/BrowserView.cpp @@ -331,7 +331,7 @@ BrowserView::BrowserView(QWidget* parent) #ifdef QTWEBKIT textSizeMultiplier = 1.0; - view->page()->setLinkDelegationPolicy(QWebView::DelegateAllLinks); + view->page()->setLinkDelegationPolicy(QWebPage::DelegateAllLinks); view->page()->setForwardUnsupportedContent(true); // set our custom cookie manager diff --git a/src/Mod/Web/Gui/CMakeLists.txt b/src/Mod/Web/Gui/CMakeLists.txt index db2e42098a..98b20b2bdf 100644 --- a/src/Mod/Web/Gui/CMakeLists.txt +++ b/src/Mod/Web/Gui/CMakeLists.txt @@ -9,7 +9,7 @@ include_directories( if (Qt5WebEngineWidgets_FOUND) add_definitions(-DQTWEBENGINE) -elseif(Qt5WebKitWidgets_FOUND or QT_QTWEBKIT_FOUND) # Qt5 and Qt4 +elseif(Qt5WebKitWidgets_FOUND OR QT_QTWEBKIT_FOUND) # Qt5 and Qt4 add_definitions(-DQTWEBKIT) endif()