Branch of Qt5.11 features

4 files changed, 1 insertions, 62 deletions

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);