From b9d5851ef52165eb7e345c6a66b224b3663e0f81 Mon Sep 17 00:00:00 2001 From: David Rosca Date: Fri, 28 Aug 2015 16:11:58 +0200 Subject: [PATCH] Renamed src/webkit -> src/webengine --- src/lib/app/mainapplication.cpp | 1 + src/lib/lib.pro | 34 +++++++++---------- .../javascript/externaljsobject.cpp | 0 .../javascript/externaljsobject.h | 0 src/lib/{webkit => webengine}/jsalert.ui | 0 src/lib/{webkit => webengine}/jsconfirm.ui | 0 src/lib/{webkit => webengine}/jsprompt.ui | 0 src/lib/{webkit => webengine}/loadrequest.cpp | 0 src/lib/{webkit => webengine}/loadrequest.h | 0 .../{webkit => webengine}/webinspector.cpp | 0 src/lib/{webkit => webengine}/webinspector.h | 0 src/lib/{webkit => webengine}/webpage.cpp | 0 src/lib/{webkit => webengine}/webpage.h | 0 .../webpluginfactory.cpp | 0 .../{webkit => webengine}/webpluginfactory.h | 0 src/lib/{webkit => webengine}/webview.cpp | 0 src/lib/{webkit => webengine}/webview.h | 0 src/plugins.pri | 2 +- tests/autotests/autotests.pro | 2 +- 19 files changed, 20 insertions(+), 19 deletions(-) rename src/lib/{webkit => webengine}/javascript/externaljsobject.cpp (100%) rename src/lib/{webkit => webengine}/javascript/externaljsobject.h (100%) rename src/lib/{webkit => webengine}/jsalert.ui (100%) rename src/lib/{webkit => webengine}/jsconfirm.ui (100%) rename src/lib/{webkit => webengine}/jsprompt.ui (100%) rename src/lib/{webkit => webengine}/loadrequest.cpp (100%) rename src/lib/{webkit => webengine}/loadrequest.h (100%) rename src/lib/{webkit => webengine}/webinspector.cpp (100%) rename src/lib/{webkit => webengine}/webinspector.h (100%) rename src/lib/{webkit => webengine}/webpage.cpp (100%) rename src/lib/{webkit => webengine}/webpage.h (100%) rename src/lib/{webkit => webengine}/webpluginfactory.cpp (100%) rename src/lib/{webkit => webengine}/webpluginfactory.h (100%) rename src/lib/{webkit => webengine}/webview.cpp (100%) rename src/lib/{webkit => webengine}/webview.h (100%) diff --git a/src/lib/app/mainapplication.cpp b/src/lib/app/mainapplication.cpp index 16dae460e..8cea800b7 100644 --- a/src/lib/app/mainapplication.cpp +++ b/src/lib/app/mainapplication.cpp @@ -67,6 +67,7 @@ #include #include + #if defined(Q_OS_WIN) && !defined(Q_OS_OS2) #include "registerqappassociation.h" #endif diff --git a/src/lib/lib.pro b/src/lib/lib.pro index ac0090e2b..f70ac3fe8 100644 --- a/src/lib/lib.pro +++ b/src/lib/lib.pro @@ -1,4 +1,4 @@ -QT += webenginewidgets webenginewidgets-private network widgets printsupport sql script gui-private +QT += webenginewidgets webenginewidgets-private webchannel network widgets printsupport sql script gui-private TARGET = QupZilla TEMPLATE = lib @@ -39,7 +39,7 @@ INCLUDEPATH += 3rdparty \ sidebar \ tabwidget \ tools \ - webkit \ + webengine \ webtab \ DEPENDPATH += $$INCLUDEPATH \ @@ -232,12 +232,12 @@ SOURCES += \ tools/toolbutton.cpp \ tools/treewidget.cpp \ tools/widget.cpp \ - webkit/javascript/externaljsobject.cpp \ - webkit/loadrequest.cpp \ - webkit/webinspector.cpp \ - webkit/webpage.cpp \ - webkit/webpluginfactory.cpp \ - webkit/webview.cpp \ + webengine/javascript/externaljsobject.cpp \ + webengine/loadrequest.cpp \ + webengine/webinspector.cpp \ + webengine/webpage.cpp \ + webengine/webpluginfactory.cpp \ + webengine/webview.cpp \ webtab/searchtoolbar.cpp \ webtab/tabbedwebview.cpp \ webtab/webtab.cpp \ @@ -436,12 +436,12 @@ HEADERS += \ tools/toolbutton.h \ tools/treewidget.h \ tools/widget.h \ - webkit/javascript/externaljsobject.h \ - webkit/loadrequest.h \ - webkit/webinspector.h \ - webkit/webpage.h \ - webkit/webpluginfactory.h \ - webkit/webview.h \ + webengine/javascript/externaljsobject.h \ + webengine/loadrequest.h \ + webengine/webinspector.h \ + webengine/webpage.h \ + webengine/webpluginfactory.h \ + webengine/webview.h \ webtab/searchtoolbar.h \ webtab/tabbedwebview.h \ webtab/webtab.h \ @@ -495,9 +495,9 @@ FORMS += \ tools/docktitlebarwidget.ui \ tools/html5permissions/html5permissionsdialog.ui \ tools/html5permissions/html5permissionsnotification.ui \ - webkit/jsalert.ui \ - webkit/jsconfirm.ui \ - webkit/jsprompt.ui \ + webengine/jsalert.ui \ + webengine/jsconfirm.ui \ + webengine/jsprompt.ui \ webtab/searchtoolbar.ui \ RESOURCES += \ diff --git a/src/lib/webkit/javascript/externaljsobject.cpp b/src/lib/webengine/javascript/externaljsobject.cpp similarity index 100% rename from src/lib/webkit/javascript/externaljsobject.cpp rename to src/lib/webengine/javascript/externaljsobject.cpp diff --git a/src/lib/webkit/javascript/externaljsobject.h b/src/lib/webengine/javascript/externaljsobject.h similarity index 100% rename from src/lib/webkit/javascript/externaljsobject.h rename to src/lib/webengine/javascript/externaljsobject.h diff --git a/src/lib/webkit/jsalert.ui b/src/lib/webengine/jsalert.ui similarity index 100% rename from src/lib/webkit/jsalert.ui rename to src/lib/webengine/jsalert.ui diff --git a/src/lib/webkit/jsconfirm.ui b/src/lib/webengine/jsconfirm.ui similarity index 100% rename from src/lib/webkit/jsconfirm.ui rename to src/lib/webengine/jsconfirm.ui diff --git a/src/lib/webkit/jsprompt.ui b/src/lib/webengine/jsprompt.ui similarity index 100% rename from src/lib/webkit/jsprompt.ui rename to src/lib/webengine/jsprompt.ui diff --git a/src/lib/webkit/loadrequest.cpp b/src/lib/webengine/loadrequest.cpp similarity index 100% rename from src/lib/webkit/loadrequest.cpp rename to src/lib/webengine/loadrequest.cpp diff --git a/src/lib/webkit/loadrequest.h b/src/lib/webengine/loadrequest.h similarity index 100% rename from src/lib/webkit/loadrequest.h rename to src/lib/webengine/loadrequest.h diff --git a/src/lib/webkit/webinspector.cpp b/src/lib/webengine/webinspector.cpp similarity index 100% rename from src/lib/webkit/webinspector.cpp rename to src/lib/webengine/webinspector.cpp diff --git a/src/lib/webkit/webinspector.h b/src/lib/webengine/webinspector.h similarity index 100% rename from src/lib/webkit/webinspector.h rename to src/lib/webengine/webinspector.h diff --git a/src/lib/webkit/webpage.cpp b/src/lib/webengine/webpage.cpp similarity index 100% rename from src/lib/webkit/webpage.cpp rename to src/lib/webengine/webpage.cpp diff --git a/src/lib/webkit/webpage.h b/src/lib/webengine/webpage.h similarity index 100% rename from src/lib/webkit/webpage.h rename to src/lib/webengine/webpage.h diff --git a/src/lib/webkit/webpluginfactory.cpp b/src/lib/webengine/webpluginfactory.cpp similarity index 100% rename from src/lib/webkit/webpluginfactory.cpp rename to src/lib/webengine/webpluginfactory.cpp diff --git a/src/lib/webkit/webpluginfactory.h b/src/lib/webengine/webpluginfactory.h similarity index 100% rename from src/lib/webkit/webpluginfactory.h rename to src/lib/webengine/webpluginfactory.h diff --git a/src/lib/webkit/webview.cpp b/src/lib/webengine/webview.cpp similarity index 100% rename from src/lib/webkit/webview.cpp rename to src/lib/webengine/webview.cpp diff --git a/src/lib/webkit/webview.h b/src/lib/webengine/webview.h similarity index 100% rename from src/lib/webkit/webview.h rename to src/lib/webengine/webview.h diff --git a/src/plugins.pri b/src/plugins.pri index d235ba230..f991dd814 100644 --- a/src/plugins.pri +++ b/src/plugins.pri @@ -21,7 +21,7 @@ INCLUDEPATH += $$PWD/lib/3rdparty \ $$PWD/lib/sidebar \ $$PWD/lib/tabwidget \ $$PWD/lib/tools \ - $$PWD/lib/webkit \ + $$PWD/lib/webengine \ $$PWD/lib/webtab \ DEPENDPATH += $$INCLUDEPATH \ diff --git a/tests/autotests/autotests.pro b/tests/autotests/autotests.pro index 4799da447..571d6f78a 100644 --- a/tests/autotests/autotests.pro +++ b/tests/autotests/autotests.pro @@ -50,7 +50,7 @@ INCLUDEPATH += $$PWD/../../src/lib/3rdparty \ $$PWD/../../src/lib/sidebar \ $$PWD/../../src/lib/tabwidget \ $$PWD/../../src/lib/tools \ - $$PWD/../../src/lib/webkit \ + $$PWD/../../src/lib/webengine \ $$PWD/../../src/lib/webtab \ HEADERS += \