diff options
| author | Michal Klocek <michal.klocek@qt.io> | 2016-11-23 20:08:09 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-01-25 09:15:33 +0000 |
| commit | 2fab4a04938a4ddc30f9bdb1749e75e26a3df354 (patch) | |
| tree | 20ffd5d85f3f851c88beb2652f68f9e9291190b5 /src/core/core.pro | |
| parent | c2447a308882ba3691d66b2c28df197f571518c7 (diff) | |
Add gn build of qtwebengine for linux
This commit uses gn instead of gyp to build on desktop
linux.
Use WEBENGINE_CONFIG+=use_gn to use gn during the build
instead of gyp.
Change-Id: Ifd3d8d0835b47c323a8d39c320eb55e5e1024dee
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'src/core/core.pro')
| -rw-r--r-- | src/core/core.pro | 29 |
1 files changed, 26 insertions, 3 deletions
diff --git a/src/core/core.pro b/src/core/core.pro index e495685eb..42906cbca 100644 --- a/src/core/core.pro +++ b/src/core/core.pro @@ -14,15 +14,38 @@ core_module.depends = core_api core_generator.file = core_generator.pro core_generator.depends = core_headers - use?(gn) { + # core_gn_generator.pro is a dummy .pro file that is used by qmake + # to generate our main BUILD.gn file + + core_icu.files = $$OUT_PWD/$$getConfigDir()/icudtl.dat + core_icu.path = $$[QT_INSTALL_DATA]/resources + core_icu.CONFIG += no_check_exist + + core_locales.files = $$OUT_PWD/$$getConfigDir()/qtwebengine_locales/*.pak + core_locales.path = $$[QT_INSTALL_TRANSLATIONS]/qtwebengine_locales + core_locales.CONFIG += no_check_exist + + core_resources.files = \ + $$OUT_PWD/$$getConfigDir()/qtwebengine_resources.pak \ + $$OUT_PWD/$$getConfigDir()/qtwebengine_resources_100p.pak \ + $$OUT_PWD/$$getConfigDir()/qtwebengine_resources_200p.pak \ + $$OUT_PWD/$$getConfigDir()/qtwebengine_devtools_resources.pak + core_resources.path = $$[QT_INSTALL_DATA]/resources + core_resources.CONFIG += no_check_exist + INSTALLS += core_resources core_locales core_icu gn_run.file = gn_run.pro gn_run.depends = core_generator - SUBDIRS += gn_run \ + core_api.depends = gn_run + + SUBDIRS += \ + core_api \ core_headers \ - core_generator + core_generator \ + core_module \ + gn_run } else { # gyp_run.pro calls gyp through gyp_qtwebengine on the qmake step, and ninja on the make step. |