diff options
| author | Liang Qi <liang.qi@qt.io> | 2016-05-20 06:08:18 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@qt.io> | 2016-05-20 06:08:18 +0200 |
| commit | 6c344184df2dd6573681a0d2022daa55b6a36f38 (patch) | |
| tree | 91493089f958b95138bdbd3f838188450e4349bb /examples/webenginewidgets/demobrowser/demobrowser.pro | |
| parent | bfc5eb719d30decaf5c65e2747d49a6eec28794d (diff) | |
| parent | bc317d32a65eb08da7df10bec6417829533cfc3a (diff) | |
Merge remote-tracking branch 'origin/5.6' into 5.7
Conflicts:
src/3rdparty
src/core/browser_context_adapter.cpp
src/core/web_contents_adapter.cpp
tests/auto/widgets/qwebenginepage/BLACKLIST
Change-Id: I45ee0a33f6316f585555d58fede8072fe514aecf
Diffstat (limited to 'examples/webenginewidgets/demobrowser/demobrowser.pro')
| -rw-r--r-- | examples/webenginewidgets/demobrowser/demobrowser.pro | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/examples/webenginewidgets/demobrowser/demobrowser.pro b/examples/webenginewidgets/demobrowser/demobrowser.pro index 87f362f90..aef7b9eac 100644 --- a/examples/webenginewidgets/demobrowser/demobrowser.pro +++ b/examples/webenginewidgets/demobrowser/demobrowser.pro @@ -86,7 +86,9 @@ mac { TARGET = Demobrowser } -EXAMPLE_FILES = Info_mac.plist demobrowser.icns demobrowser.ico demobrowser.rc +EXAMPLE_FILES = \ + Info_mac.plist demobrowser.icns demobrowser.ico demobrowser.rc \ + cookiejar.h cookiejar.cpp # FIXME: these are currently unused. # install target.path = $$[QT_INSTALL_EXAMPLES]/webenginewidgets/demobrowser |