diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-07-28 17:29:14 +0200 |
|---|---|---|
| committer | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-08-14 16:43:32 +0200 |
| commit | b1d423a3fc2cb3eeacc2a3e91ac9bdd2211c2613 (patch) | |
| tree | 53f39e4e7c6a76d19a92fc23fde0728e6df95fc7 /src/core/core.pro | |
| parent | f987b713b9f4e363056bf5174a762acb5b77ed79 (diff) | |
Update the QtWebEngineCore library to run on top of Chromium 37
Most of the patch is about upstream classes/methods that changed.
Other important details:
- icu data files are now used by default
- cygwin is no longer required to build on Windows
- RenderFrameHost has been replacing RenderViewHost in a few places,
following the separate process iframes support in Chromium
- The user agent is accessed through ContentClient::GetUserAgent
instead of from the command line switches
Change-Id: I86cc93aff7ce31176a80b0b4a5d54025674a451c
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'src/core/core.pro')
| -rw-r--r-- | src/core/core.pro | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/core/core.pro b/src/core/core.pro index 67e27f3ad..02a707f21 100644 --- a/src/core/core.pro +++ b/src/core/core.pro @@ -38,16 +38,15 @@ macx: PLUGIN_PREFIX = win32 { PLUGIN_EXTENSION = .dll PLUGIN_PREFIX = - - icu.files = $$OUT_PWD/$$getConfigDir()/icudt46l.dat - icu.CONFIG += no_check_exist - icu.path = $$[QT_INSTALL_BINS] - INSTALLS += icu } +icu.files = $$OUT_PWD/$$getConfigDir()/icudtl.dat +icu.CONFIG += no_check_exist +icu.path = $$[QT_INSTALL_DATA] + plugins.files = $$OUT_PWD/$$getConfigDir()/$${PLUGIN_PREFIX}ffmpegsumo$${PLUGIN_EXTENSION} plugins.CONFIG += no_check_exist plugins.path = $$[QT_INSTALL_PLUGINS]/qtwebengine -INSTALLS += locales resources plugins +INSTALLS += icu locales resources plugins |