forcibly remove webkit and webkitwidgets dependancies

akdor1154 · Mar 12, 2015 · 0d9ae59 · 0d9ae59
1 parent c354754
commit 0d9ae59
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 16 deletions.
diff --git a/src/fakewebview.h b/src/fakewebview.h
@@ -3,7 +3,6 @@
 
 #include <QtNetwork>
 
-#include <QtWebKitWidgets/QWebView>
 #include <QWebEngineView>
 
 class FakeWebView : public QWebEngineView

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
@@ -43,15 +43,13 @@
 
 #include <QtGui>
 #include <QtNetwork>
-#include <QtWebKit>
 #include <QtWebEngine>
 #include <QDebug>
 #include "mainwindow.h"
 
 #include <QStandardPaths>
 #include <QApplication>
 #include <QDesktopWidget>
-#include <QtWebKitWidgets/QWebFrame>
 #include <QtWebEngineWidgets>
 
 #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
@@ -43,14 +43,13 @@
 #include <QProgressBar>
 #include <QMainWindow>
 #include <QtNetwork>
-#include <QtWebKit>
 #include <QtWebEngine>
 
 #ifdef USE_TESTLIB
 #include <QtTest/QTestEventList>
 #endif
 
-#include <QtWebKitWidgets/QWebInspector>
+//#include <QtWebEngineWidgets/QWebInspector>
 
 #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
@@ -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
@@ -2,7 +2,6 @@
 
 #include <QtDebug>
 #include <QtGui>
-#include <QtWebKit>
 #include <QtWebEngine>
 #include "webview.h"
 #include <signal.h>

diff --git a/src/webview.h b/src/webview.h
@@ -1,15 +1,13 @@
 #ifndef WEBVIEW_H
 #define WEBVIEW_H
 
-#include <QtWebKit>
-
-#include <QtWebKitWidgets/QWebView>
-#include <QtWebKitWidgets/QWebFrame>
 
 #include <QtWebEngineWidgets/QWebEnginePage>
 #include <QtWebEngineWidgets/QWebEngineView>
 
 #include <QPrinter>
+#include <QIcon>
+
 #include <qplayer.h>
 #include <fakewebview.h>