Branch of Qt5.11 features

10 files changed, 9 insertions, 82 deletions

diff --git a/.hgignore b/.hgignore
index 5cb74c5..3b2deab 100644
--- a/.hgignore
+++ b/.hgignore
@@ -1,3 +1,7 @@
 # clion
 cmake-build-*
-.idea
\ No newline at end of file
+.idea
+
+# kdevelop
+build*
+.kdev4
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f582600..ed4a485 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -12,7 +12,7 @@ option(Tests "Enable/disable some basic autotests" ON)
 
 # Libraries
 find_package(Qt5 COMPONENTS Core Widgets Concurrent REQUIRED)
-find_package(Qt5 5.11 COMPONENTS WebEngineWidgets REQUIRED)
+find_package(Qt5 5.10.1 COMPONENTS WebEngineWidgets REQUIRED)
 find_package(Boost COMPONENTS program_options REQUIRED)
 
 # Global C++ settings
diff --git a/linux/makepkg/PKGBUILD b/linux/makepkg/PKGBUILD
index 2c817af..5aad62a 100644
--- a/linux/makepkg/PKGBUILD
+++ b/linux/makepkg/PKGBUILD
@@ -12,8 +12,8 @@ license=('GPL3')
 # -hg replace the old -git package
 replaces=('smolbote-git')
 
-depends=('qt5-webengine>=5.11.0beta2' 'boost-libs>=1.66.0')
-makedepends=('mercurial' 'cmake' 'pkg-config' 'ninja' 'qt5-webengine>=5.11.0beta2' 'boost>=1.66.0')
+depends=('qt5-webengine>=5.10.1' 'boost-libs>=1.66.0')
+makedepends=('mercurial' 'cmake' 'pkg-config' 'ninja' 'qt5-webengine>=5.10.1' 'boost>=1.66.0')
 
 # this is the central repository
 source=("smolbote-hg::hg+https://neueland.iserlohn-fortress.net/smolbote.hg")
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 03f6c17..0f978b5 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -42,8 +42,6 @@ add_executable(poi
         widgets/mainwindowmenubar.h
 
         # webengine
-        webengine/cookiefilter.cpp
-        webengine/cookiefilter.h
         webengine/urlinterceptor.cpp
         webengine/urlinterceptor.h
         webengine/webengineprofile.cpp    # todo: rename to profile
@@ -61,10 +59,6 @@ add_executable(poi
         forms/aboutdialog.cpp
         forms/aboutdialog.h
         forms/aboutdialog.ui
-        # todo: move to webengine
-        #forms/cookiesform.cpp
-        #forms/cookiesform.h
-        #forms/cookiesform.ui
 
         # plugin interfaces
         ../plugins/interfaces.h
diff --git a/src/browser.cpp b/src/browser.cpp
index 5a35a9e..c32aee7 100644
--- a/src/browser.cpp
+++ b/src/browser.cpp
@@ -35,7 +35,6 @@ Browser::~Browser()
     qDebug("Thread pool is done: %s", QThreadPool::globalInstance()->waitForDone() ? "okay" : "failed");
 
     delete m_urlRequestInterceptor;
-    delete m_cookieInterceptor;
 }
 
 void Browser::setConfiguration(std::shared_ptr<Configuration> &config)
@@ -64,9 +63,6 @@ void Browser::setConfiguration(std::shared_ptr<Configuration> &config)
     m_downloadManager = std::make_shared<DownloadsWidget>(QString::fromStdString(m_config->value<std::string>("downloads.path").value()));
 
     m_urlRequestInterceptor = new UrlRequestInterceptor(QString::fromStdString(m_config->value<std::string>("filter.path").value()));
-    m_cookieInterceptor = new CookieFilter(
-        m_config->value<bool>("filter.cookies.block.all").value(),
-        m_config->value<bool>("filter.cookies.block.thirdParty").value());
 
     // set default profile
     m_defaultProfile = profile(QString::fromStdString(m_config->value<std::string>("browser.profile").value()));
@@ -154,10 +150,6 @@ std::shared_ptr<WebEngineProfile> Browser::profile(const QString &storageName)
     }
 
     _profile->setRequestInterceptor(m_urlRequestInterceptor);
-    _profile->cookieStore()->setCookieFilter([this](const QWebEngineCookieStore::FilterRequest &request) {
-        // If the cookie access is to be accepted, the filter function should return true; otherwise it should return false.
-        return !m_cookieInterceptor->shouldBlock(request);
-    });
 
     connect(_profile.get(), &WebEngineProfile::downloadRequested, m_downloadManager.get(), &DownloadsWidget::addDownload);
 
diff --git a/src/browser.h b/src/browser.h
index 1f86327..f96d8c5 100644
--- a/src/browser.h
+++ b/src/browser.h
@@ -20,7 +20,6 @@ class BookmarksWidget;
 class DownloadsWidget;
 class UrlRequestInterceptor;
 class WebEngineProfile;
-class CookieFilter;
 class Browser : public SingleApplication
 {
     Q_OBJECT
@@ -63,7 +62,6 @@ private:
     std::shared_ptr<WebEngineProfile> m_defaultProfile;
 
     UrlRequestInterceptor *m_urlRequestInterceptor = nullptr;
-    CookieFilter *m_cookieInterceptor = nullptr;
     std::shared_ptr<BookmarksWidget> m_bookmarksManager;
     std::shared_ptr<DownloadsWidget> m_downloadManager;
 };
diff --git a/src/webengine/cookiefilter.cpp b/src/webengine/cookiefilter.cpp
deleted file mode 100644
index 08938b1..0000000
--- a/src/webengine/cookiefilter.cpp
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * This file is part of smolbote. It's copyrighted by the contributors recorded
- * in the version control history of the file, available from its original
- * location: https://neueland.iserlohn-fortress.net/smolbote.hg
- *
- * SPDX-License-Identifier: GPL-3.0
- */
-
-#include "cookiefilter.h"
-
-CookieFilter::CookieFilter(bool shouldBlockAll, bool shouldBlockThirdParty, QObject *parent)
-    : QObject(parent)
-{
-    blockAll = shouldBlockAll;
-    blockThirdParty = shouldBlockThirdParty;
-}
-
-bool CookieFilter::shouldBlock(const QWebEngineCookieStore::FilterRequest &filter)
-{
-    // block all check
-    if(blockAll)
-        return true;
-
-    // block third-party cookies check
-    if(blockThirdParty && filter.thirdParty)
-        return true;
-
-    // otherwise, don't block
-    return false;
-}
diff --git a/src/webengine/cookiefilter.h b/src/webengine/cookiefilter.h
deleted file mode 100644
index b537c57..0000000
--- a/src/webengine/cookiefilter.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * This file is part of smolbote. It's copyrighted by the contributors recorded
- * in the version control history of the file, available from its original
- * location: https://neueland.iserlohn-fortress.net/smolbote.hg
- *
- * SPDX-License-Identifier: GPL-3.0
- */
-
-#ifndef SMOLBOTE_COOKIEFILTER_H
-#define SMOLBOTE_COOKIEFILTER_H
-
-#include <QObject>
-#include <QWebEngineCookieStore>
-
-class CookieFilter : public QObject
-{
-    Q_OBJECT
-
-public:
-    explicit CookieFilter(bool shouldBlockAll, bool shouldBlockThirdParty, QObject *parent = nullptr);
-
-public:
-    bool shouldBlock(const QWebEngineCookieStore::FilterRequest &filter);
-
-private:
-    bool blockAll = false;
-    bool blockThirdParty = false;
-};
-
-#endif //SMOLBOTE_COOKIEFILTER_H
diff --git a/src/webengine/webengineprofile.h b/src/webengine/webengineprofile.h
index 76295d3..a38c977 100644
--- a/src/webengine/webengineprofile.h
+++ b/src/webengine/webengineprofile.h
@@ -9,7 +9,6 @@
 #ifndef SMOLBOTE_WEBENGINEPROFILE_H
 #define SMOLBOTE_WEBENGINEPROFILE_H
 
-#include "cookiefilter.h"
 #include <QUrl>
 #include <QWebEngineProfile>
 
diff --git a/src/webengine/widgets/pagetoolsmenu.cpp b/src/webengine/widgets/pagetoolsmenu.cpp
index 34c9d65..381c6f4 100644
--- a/src/webengine/widgets/pagetoolsmenu.cpp
+++ b/src/webengine/widgets/pagetoolsmenu.cpp
@@ -52,7 +52,7 @@ QDialog *PageToolsMenu::createDevToolsDialog(QWebEnginePage *page)
     auto *devPage = new QWebEnginePage(view);
 
     view->setPage(devPage);
-    page->setDevToolsPage(devPage);
+//    page->setDevToolsPage(devPage);
 
     auto *l = new QVBoxLayout(popup);
     l->setContentsMargins(0, 0, 0, 0);