diff --git a/src/fakewebview.h b/src/fakewebview.h index f98193d..cc6af72 100644 --- a/src/fakewebview.h +++ b/src/fakewebview.h @@ -3,7 +3,6 @@ #include -#include #include class FakeWebView : public QWebEngineView diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp index 60d7750..722caed 100644 --- a/src/mainwindow.cpp +++ b/src/mainwindow.cpp @@ -43,7 +43,6 @@ #include #include -#include #include #include #include "mainwindow.h" @@ -51,7 +50,6 @@ #include #include #include -#include #include #include "cachingnm.h" @@ -288,7 +286,7 @@ void MainWindow::cleanupSlot() qDebug("Cleanup Slot (application exit)"); handler->stop(); clearCacheOnExit(); - QWebSettings::clearMemoryCaches(); + //QWebEngineSettings::clearMemoryCaches(); } void MainWindow::showFullScreen() { @@ -402,13 +400,13 @@ void MainWindow::keyPressEvent(QKeyEvent *event) view->reload(); break; case Qt::Key_F12: - if (mainSettings->value("inspector/enable").toBool()) { + /* if (mainSettings->value("inspector/enable").toBool()) { if (!inspector->isVisible()) { inspector->setVisible(true); } else { inspector->setVisible(false); } - } + }*/ break; case Qt::Key_F11: if (isFullScreen()) { @@ -695,7 +693,7 @@ void MainWindow::startLoading() adjustTitle(); - QWebSettings::clearMemoryCaches(); + //QWebEngineSettings::clearMemoryCaches(); if (mainSettings->value("view/show_load_progress").toBool()) { loadProgress->show(); diff --git a/src/mainwindow.h b/src/mainwindow.h index 8e0d202..77876a9 100644 --- a/src/mainwindow.h +++ b/src/mainwindow.h @@ -43,14 +43,13 @@ #include #include #include -#include #include #ifdef USE_TESTLIB #include #endif -#include +//#include #include "webview.h" #include "anyoption.h" @@ -115,7 +114,7 @@ protected slots: QSettings *mainSettings; QNetworkDiskCache *diskCache; - QWebInspector *inspector; + //QWebInspector *inspector; QKeyEvent * eventExit; diff --git a/src/qt-webengine-kiosk.pro b/src/qt-webengine-kiosk.pro index a7af076..f81338b 100644 --- a/src/qt-webengine-kiosk.pro +++ b/src/qt-webengine-kiosk.pro @@ -4,7 +4,7 @@ # #------------------------------------------------- -QT = core gui network webkit widgets webkitwidgets printsupport multimedia testlib webenginewidgets +QT = core gui network widgets printsupport multimedia testlib webenginewidgets CONFIG += console link_pkgconfig TARGET = qt-webengine-kiosk diff --git a/src/webview.cpp b/src/webview.cpp index 14c232e..407fa22 100644 --- a/src/webview.cpp +++ b/src/webview.cpp @@ -2,7 +2,6 @@ #include #include -#include #include #include "webview.h" #include diff --git a/src/webview.h b/src/webview.h index d853705..c777198 100644 --- a/src/webview.h +++ b/src/webview.h @@ -1,15 +1,13 @@ #ifndef WEBVIEW_H #define WEBVIEW_H -#include - -#include -#include #include #include #include +#include + #include #include