diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2013-11-15 14:21:17 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-11-18 14:53:08 +0100 |
| commit | ec7b2ee70a8b2db7fb87f50671a001ddd54697b0 (patch) | |
| tree | 788f01a500667ddff3fc485d4be27a57b4e881e2 /qtwebengine.pro | |
| parent | 175cc28b9716f7f4f10eeee53fc541e556abe22e (diff) | |
Add an intermediate Qt5WebEngine module library.
Make the WebEngine QtQuick plubin library a library only that fetches
the API privatly from the official module.
This will allow an experimental plugin library to also have access to
the API classes, which it currently can't since the plugins aren't
deployed the same way as module to <prefix>/lib.
The module currently only export classes privately but the plan is
to make this library the official linking point of entry for
applications along with the Qt5WebEngineWidgets module.
The WebEngineCore library could eventyally be merged into this module
library if we can get gyp to play well with qmake.
Change-Id: I5edb60b412e213b59f791a7b8df9f28c295502de
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'qtwebengine.pro')
| -rw-r--r-- | qtwebengine.pro | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/qtwebengine.pro b/qtwebengine.pro index 605e0a2e1..b640e5414 100644 --- a/qtwebengine.pro +++ b/qtwebengine.pro @@ -12,15 +12,18 @@ lib.depends = qmake_extras process.depends = qmake_extras # API libraries -quick_lib.subdir = lib/quick -quick_lib.target = sub-quick-lib -quick_lib.depends = build +webengine_lib.subdir = lib/quick +webengine_lib.target = sub-webengine-lib +webengine_lib.depends = build +quick_plugin_lib.subdir = lib/quick/plugin +quick_plugin_lib.target = sub-quick-plugin-lib +quick_plugin_lib.depends = webengine_lib widgets_lib.subdir = lib/widgets widgets_lib.target = sub-widgets-lib widgets_lib.depends = build -sub_examples.depends = quick_lib -sub_tests.depends = quick_lib +sub_examples.depends = quick_plugin_lib +sub_tests.depends = quick_plugin_lib # This is where we use the generated gypi files and run gyp_qtwebengine build.depends = resources shared lib process @@ -31,7 +34,8 @@ SUBDIRS += qmake_extras \ lib \ process \ build \ - quick_lib + webengine_lib \ + quick_plugin_lib qtHaveModule(widgets) { SUBDIRS += widgets_lib |