Renamed src/webkit -> src/webengine

remotes/origin/falkon
David Rosca 11 years ago
parent adea1139b9
commit b9d5851ef5
  1. 1
      src/lib/app/mainapplication.cpp
  2. 34
      src/lib/lib.pro
  3. 0
      src/lib/webengine/javascript/externaljsobject.cpp
  4. 0
      src/lib/webengine/javascript/externaljsobject.h
  5. 0
      src/lib/webengine/jsalert.ui
  6. 0
      src/lib/webengine/jsconfirm.ui
  7. 0
      src/lib/webengine/jsprompt.ui
  8. 0
      src/lib/webengine/loadrequest.cpp
  9. 0
      src/lib/webengine/loadrequest.h
  10. 0
      src/lib/webengine/webinspector.cpp
  11. 0
      src/lib/webengine/webinspector.h
  12. 0
      src/lib/webengine/webpage.cpp
  13. 0
      src/lib/webengine/webpage.h
  14. 0
      src/lib/webengine/webpluginfactory.cpp
  15. 0
      src/lib/webengine/webpluginfactory.h
  16. 0
      src/lib/webengine/webview.cpp
  17. 0
      src/lib/webengine/webview.h
  18. 2
      src/plugins.pri
  19. 2
      tests/autotests/autotests.pro

@ -67,6 +67,7 @@
#include <QWebEngineDownloadItem> #include <QWebEngineDownloadItem>
#include <QWebEngineScriptCollection> #include <QWebEngineScriptCollection>
#if defined(Q_OS_WIN) && !defined(Q_OS_OS2) #if defined(Q_OS_WIN) && !defined(Q_OS_OS2)
#include "registerqappassociation.h" #include "registerqappassociation.h"
#endif #endif

@ -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 TARGET = QupZilla
TEMPLATE = lib TEMPLATE = lib
@ -39,7 +39,7 @@ INCLUDEPATH += 3rdparty \
sidebar \ sidebar \
tabwidget \ tabwidget \
tools \ tools \
webkit \ webengine \
webtab \ webtab \
DEPENDPATH += $$INCLUDEPATH \ DEPENDPATH += $$INCLUDEPATH \
@ -232,12 +232,12 @@ SOURCES += \
tools/toolbutton.cpp \ tools/toolbutton.cpp \
tools/treewidget.cpp \ tools/treewidget.cpp \
tools/widget.cpp \ tools/widget.cpp \
webkit/javascript/externaljsobject.cpp \ webengine/javascript/externaljsobject.cpp \
webkit/loadrequest.cpp \ webengine/loadrequest.cpp \
webkit/webinspector.cpp \ webengine/webinspector.cpp \
webkit/webpage.cpp \ webengine/webpage.cpp \
webkit/webpluginfactory.cpp \ webengine/webpluginfactory.cpp \
webkit/webview.cpp \ webengine/webview.cpp \
webtab/searchtoolbar.cpp \ webtab/searchtoolbar.cpp \
webtab/tabbedwebview.cpp \ webtab/tabbedwebview.cpp \
webtab/webtab.cpp \ webtab/webtab.cpp \
@ -436,12 +436,12 @@ HEADERS += \
tools/toolbutton.h \ tools/toolbutton.h \
tools/treewidget.h \ tools/treewidget.h \
tools/widget.h \ tools/widget.h \
webkit/javascript/externaljsobject.h \ webengine/javascript/externaljsobject.h \
webkit/loadrequest.h \ webengine/loadrequest.h \
webkit/webinspector.h \ webengine/webinspector.h \
webkit/webpage.h \ webengine/webpage.h \
webkit/webpluginfactory.h \ webengine/webpluginfactory.h \
webkit/webview.h \ webengine/webview.h \
webtab/searchtoolbar.h \ webtab/searchtoolbar.h \
webtab/tabbedwebview.h \ webtab/tabbedwebview.h \
webtab/webtab.h \ webtab/webtab.h \
@ -495,9 +495,9 @@ FORMS += \
tools/docktitlebarwidget.ui \ tools/docktitlebarwidget.ui \
tools/html5permissions/html5permissionsdialog.ui \ tools/html5permissions/html5permissionsdialog.ui \
tools/html5permissions/html5permissionsnotification.ui \ tools/html5permissions/html5permissionsnotification.ui \
webkit/jsalert.ui \ webengine/jsalert.ui \
webkit/jsconfirm.ui \ webengine/jsconfirm.ui \
webkit/jsprompt.ui \ webengine/jsprompt.ui \
webtab/searchtoolbar.ui \ webtab/searchtoolbar.ui \
RESOURCES += \ RESOURCES += \

@ -21,7 +21,7 @@ INCLUDEPATH += $$PWD/lib/3rdparty \
$$PWD/lib/sidebar \ $$PWD/lib/sidebar \
$$PWD/lib/tabwidget \ $$PWD/lib/tabwidget \
$$PWD/lib/tools \ $$PWD/lib/tools \
$$PWD/lib/webkit \ $$PWD/lib/webengine \
$$PWD/lib/webtab \ $$PWD/lib/webtab \
DEPENDPATH += $$INCLUDEPATH \ DEPENDPATH += $$INCLUDEPATH \

@ -50,7 +50,7 @@ INCLUDEPATH += $$PWD/../../src/lib/3rdparty \
$$PWD/../../src/lib/sidebar \ $$PWD/../../src/lib/sidebar \
$$PWD/../../src/lib/tabwidget \ $$PWD/../../src/lib/tabwidget \
$$PWD/../../src/lib/tools \ $$PWD/../../src/lib/tools \
$$PWD/../../src/lib/webkit \ $$PWD/../../src/lib/webengine \
$$PWD/../../src/lib/webtab \ $$PWD/../../src/lib/webtab \
HEADERS += \ HEADERS += \

Loading…
Cancel
Save