diff options
author | Pierre Rossi <pierre.rossi@digia.com> | 2013-07-10 16:27:48 +0200 |
---|---|---|
committer | Pierre Rossi <pierre.rossi@gmail.com> | 2013-07-31 13:39:50 +0200 |
commit | 67d042d04f2b6cbe98f4eba2a50ed0d374165cae (patch) | |
tree | ff24cf732fa98750400a29354219ffbd70c84e1c /lib/lib.pro | |
parent | 519367a98334b658a93ed1ba096dba92858445c7 (diff) |
Split out the Widgets and QtQuick integration
This is the first step to making proper Qt Modules out of QtWebEngine.
The Widgets integration becomes a proper C++ Qt Module while we make
the QtQuick side a QML plugin for now (could probably be promoted if
the need arises).
Code-wise, this means the introduction of a WebContentsAdapterClient
interface that is subclassed by the private implementation of our API
classes for delegation of things that are UI specific. Functionality
from WebContents and the like is exposed via the WebContentsAdapter.
Change-Id: I4ca3395b9fe8502a24e36002cfd5af44067bb6e8
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'lib/lib.pro')
-rw-r--r-- | lib/lib.pro | 18 |
1 files changed, 5 insertions, 13 deletions
diff --git a/lib/lib.pro b/lib/lib.pro index 38fac7b02..3627c984f 100644 --- a/lib/lib.pro +++ b/lib/lib.pro @@ -7,7 +7,7 @@ GYPINCLUDES += ../qtwebengine.gypi TEMPLATE = lib -TARGET = Qt5WebEngine +TARGET = Qt5WebEngineCore # Defining keywords such as 'signal' clashes with the chromium code base. DEFINES += QT_NO_KEYWORDS @@ -18,8 +18,6 @@ PER_CONFIG_DEFINES = QTWEBENGINEPROCESS_PATH=\\\"$$getOutDir()/%config/$$QTWEBEN # Keep Skia happy CONFIG(release, debug|release): DEFINES += NDEBUG -QT += widgets quick - RESOURCES += lib_resources.qrc # We need this to find the include files generated for the .pak resource files. INCLUDEPATH += $$absolute_path(../resources, $$PWD) @@ -27,13 +25,11 @@ INCLUDEPATH += $$absolute_path(../resources, $$PWD) SOURCES = \ backing_store_qt.cpp \ content_browser_client_qt.cpp \ - qquickwebcontentsview.cpp \ - qwebcontentsview.cpp \ render_widget_host_view_qt.cpp \ - render_widget_host_view_qt_delegate_quick.cpp \ - render_widget_host_view_qt_delegate_widget.cpp \ + render_widget_host_view_qt_delegate.cpp \ resource_context_qt.cpp \ url_request_context_getter_qt.cpp \ + web_contents_adapter.cpp \ web_contents_delegate_qt.cpp \ web_contents_view_qt.cpp \ web_engine_context.cpp \ @@ -43,16 +39,12 @@ HEADERS = \ backing_store_qt.h \ browser_context_qt.h \ content_browser_client_qt.h \ - qquickwebcontentsview.h \ - qquickwebcontentsview_p.h \ - qwebcontentsview.h \ - qwebcontentsview_p.h \ render_widget_host_view_qt.h \ render_widget_host_view_qt_delegate.h \ - render_widget_host_view_qt_delegate_quick.h \ - render_widget_host_view_qt_delegate_widget.h \ resource_context_qt.h \ url_request_context_getter_qt.h \ + web_contents_adapter.h \ + web_contents_adapter_client.h \ web_contents_delegate_qt.h \ web_contents_view_qt.h \ web_engine_context.h \ |