Description: Upstream patch to use QtWebKit instead of QtWebEngine This is an official patch from upstream, to use QtWebKit instead of QtWebEngine. We apply this because QtWebKit is available on more Debian architectures. Origin: https://sourceforge.net/projects/qtpfsgui/files/luminance/2.5.1/ Reviewed-by: Leonardo Montecchi Last-Update: 2018-01-07 diff -rupN luminance-hdr-2.5.1/CMakeLists.txt luminance-hdr-2.5.1-new/CMakeLists.txt --- luminance-hdr-2.5.1/CMakeLists.txt 2017-05-10 21:14:06.000000000 +0200 +++ luminance-hdr-2.5.1-new/CMakeLists.txt 2017-05-11 00:30:33.387938670 +0200 @@ -38,8 +38,8 @@ find_package(Qt5Core REQUIRED) find_package(Qt5Concurrent REQUIRED) find_package(Qt5Widgets REQUIRED) find_package(Qt5Gui REQUIRED) -find_package(Qt5WebEngineCore REQUIRED) -find_package(Qt5WebEngineWidgets REQUIRED) +find_package(Qt5WebKit REQUIRED) +find_package(Qt5WebKitWidgets REQUIRED) find_package(Qt5Xml REQUIRED) find_package(Qt5Sql REQUIRED) find_package(Qt5Svg REQUIRED) @@ -57,7 +57,7 @@ ENDIF(WIN32) set(LIBS ${LIBS} ${QT_QTCORE_LIBRARIES} ${QT_QTGUI_LIBRARIES} ${QT_QTNETWORK_LIBRARIES} - ${QT_QTWEBENGINE_LIBRARIES} ${QT_QTXML_LIBRARIES} ${QT_QTSQL_LIBRARIES}) + ${QT_QTWEBKIT_LIBRARIES} ${QT_QTXML_LIBRARIES} ${QT_QTSQL_LIBRARIES}) FIND_PACKAGE(Git) IF(GIT_FOUND) diff -rupN luminance-hdr-2.5.1/src/HelpBrowser/CMakeLists.txt luminance-hdr-2.5.1-new/src/HelpBrowser/CMakeLists.txt --- luminance-hdr-2.5.1/src/HelpBrowser/CMakeLists.txt 2017-05-10 21:14:06.000000000 +0200 +++ luminance-hdr-2.5.1-new/src/HelpBrowser/CMakeLists.txt 2017-05-11 00:30:33.387938670 +0200 @@ -28,7 +28,7 @@ QT5_WRAP_CPP(FILES_MOC ${FILES_H}) QT5_WRAP_UI(FILES_UI_H ${FILES_UI}) ADD_LIBRARY(helpbrowser ${FILES_H} ${FILES_CPP} ${FILES_MOC} ${FILES_UI_H} ${FILES_HXX}) -qt5_use_modules(helpbrowser Core Concurrent Gui Widgets Xml WebEngineCore WebEngineWidgets PrintSupport) +qt5_use_modules(helpbrowser Core Concurrent Gui Widgets Xml WebKit WebKitWidgets PrintSupport) SET(FILES_TO_TRANSLATE ${FILES_TO_TRANSLATE} ${FILES_CPP} ${FILES_H} ${FILES_UI} ${FILES_HXX} PARENT_SCOPE) SET(LUMINANCE_MODULES_GUI ${LUMINANCE_MODULES_GUI} helpbrowser PARENT_SCOPE) diff -rupN luminance-hdr-2.5.1/src/HelpBrowser/helpbrowser.cpp luminance-hdr-2.5.1-new/src/HelpBrowser/helpbrowser.cpp --- luminance-hdr-2.5.1/src/HelpBrowser/helpbrowser.cpp 2017-05-10 21:14:06.000000000 +0200 +++ luminance-hdr-2.5.1-new/src/HelpBrowser/helpbrowser.cpp 2017-05-11 00:32:39.449108102 +0200 @@ -166,8 +166,6 @@ HelpBrowser::HelpBrowser(QWidget* parent HelpBrowser::HelpBrowser( QWidget* parent, const QString& /*caption*/, const QString& guiLanguage, const QString& jumpToSection, const QString& jumpToFile): QMainWindow( parent ), zoomFactor(1.0), - //m_textBrowser(new QTextDocument), - m_textBrowser(new QTextBrowser), m_Ui(new Ui::HelpBrowser) { m_Ui->setupUi(this); @@ -347,13 +345,6 @@ void HelpBrowser::languageChange() void HelpBrowser::print() { - /* TODO With this method images aren't loaded so I'm passing the html page to a QTextBrowser - m_Ui->htmlPage->page()->toHtml([this](const QString &result){ - this->m_textBrowser->setHtml(result); - this->printAvailable(); - }); - */ - m_textBrowser->setSource(m_Ui->htmlPage->page()->url()); this->printAvailable(); } @@ -365,19 +356,12 @@ void HelpBrowser::printAvailable() if (dialog.exec()) { - m_textBrowser->print(&printer); + m_Ui->htmlPage->print(&printer); } } void HelpBrowser::printPreview() { - /* TODO With this method images aren't loaded so I'm passing the html page to a QTextBrowser - m_Ui->htmlPage->page()->toHtml([this](const QString &result){ - this->m_textBrowser->setHtml(result); - this->printPreviewAvailable(); - }); - */ - m_textBrowser->setSource(m_Ui->htmlPage->page()->url()); this->printPreviewAvailable(); } @@ -392,7 +376,7 @@ void HelpBrowser::printPreviewAvailable( void HelpBrowser::paintRequested(QPrinter *printer) { - m_textBrowser->print(printer); + m_Ui->htmlPage->print(printer); } void HelpBrowser::searchingButton_clicked() @@ -789,6 +773,6 @@ void HelpBrowser::loadFinished(bool) { statusBar()->showMessage(""); } -void HelpBrowser::linkHovered (const QString &url) { +void HelpBrowser::linkHovered (const QString &url, const QString &, const QString &) { statusBar()->showMessage(url); } diff -rupN luminance-hdr-2.5.1/src/HelpBrowser/helpbrowser.h luminance-hdr-2.5.1-new/src/HelpBrowser/helpbrowser.h --- luminance-hdr-2.5.1/src/HelpBrowser/helpbrowser.h 2017-05-10 21:14:06.000000000 +0200 +++ luminance-hdr-2.5.1-new/src/HelpBrowser/helpbrowser.h 2017-05-11 00:40:22.531057038 +0200 @@ -64,8 +64,6 @@ #include #include #include -//#include -#include class ScHelpTreeModel; class QPrinter; @@ -132,10 +130,6 @@ protected: QMap quickHelpIndex; QMap > bookmarkIndex; - // I need to keep this around because page()->toHtml( ) is asynchronous - //QSharedPointer m_textDocument; - QSharedPointer m_textBrowser; - protected slots: virtual void languageChange(); void histChosen(QAction* i); @@ -215,7 +209,7 @@ protected slots: /*! \brief Restore Default Cursor */ void loadFinished(bool); - void linkHovered (const QString &); + void linkHovered (const QString &, const QString &, const QString &); signals: void closed(); diff -rupN luminance-hdr-2.5.1/src/HelpBrowser/sctextbrowser.cpp luminance-hdr-2.5.1-new/src/HelpBrowser/sctextbrowser.cpp --- luminance-hdr-2.5.1/src/HelpBrowser/sctextbrowser.cpp 2017-05-10 21:14:06.000000000 +0200 +++ luminance-hdr-2.5.1-new/src/HelpBrowser/sctextbrowser.cpp 2017-05-11 00:33:42.085695414 +0200 @@ -57,7 +57,7 @@ for which a new license (GPL+exception) #include "sctextbrowser.h" ScTextBrowser::ScTextBrowser( QWidget * parent ) - : QWebEngineView(parent) + : QWebView(parent) { } diff -rupN luminance-hdr-2.5.1/src/HelpBrowser/sctextbrowser.h luminance-hdr-2.5.1-new/src/HelpBrowser/sctextbrowser.h --- luminance-hdr-2.5.1/src/HelpBrowser/sctextbrowser.h 2017-05-10 21:14:06.000000000 +0200 +++ luminance-hdr-2.5.1-new/src/HelpBrowser/sctextbrowser.h 2017-05-11 00:30:33.390938650 +0200 @@ -45,9 +45,9 @@ for which a new license (GPL+exception) #define SCTEXTBROWSER_H #include -#include +#include -class ScTextBrowser : public QWebEngineView +class ScTextBrowser : public QWebView { Q_OBJECT QUrl m_home; diff -rupN luminance-hdr-2.5.1/src/UI/CMakeLists.txt luminance-hdr-2.5.1-new/src/UI/CMakeLists.txt --- luminance-hdr-2.5.1/src/UI/CMakeLists.txt 2017-05-10 21:14:06.000000000 +0200 +++ luminance-hdr-2.5.1-new/src/UI/CMakeLists.txt 2017-05-11 00:30:33.391938643 +0200 @@ -47,7 +47,7 @@ QT5_WRAP_CPP(FILES_MOC ${FILES_H}) QT5_WRAP_UI(FILES_UI_H ${FILES_UI}) ADD_LIBRARY(ui ${FILES_H} ${FILES_CPP} ${FILES_MOC} ${FILES_UI_H}) -qt5_use_modules(ui Core Concurrent Gui Widgets WebEngineWidgets) +qt5_use_modules(ui Core Concurrent Gui Widgets WebKitWidgets) SET(FILES_TO_TRANSLATE ${FILES_TO_TRANSLATE} ${FILES_CPP} ${FILES_H} ${FILES_UI} PARENT_SCOPE) SET(LUMINANCE_MODULES_GUI ${LUMINANCE_MODULES_GUI} ui PARENT_SCOPE)