diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-02-01 20:50:41 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2017-02-01 20:58:12 +0100 |
| commit | b5d7ec9226eee41d9c3516bf51dc48c283e8b13e (patch) | |
| tree | 994d2f09fd2106efed07e007becffed6e56a584c /src/core/core.pro | |
| parent | 3c4c080e46a8fa229d7e1fdaee82f750b3558aa0 (diff) | |
| parent | 2313a580c0e3f0636a12697ba4b872bfdccbcf7f (diff) | |
Merge dev into 5.9
Change-Id: Id919bfd67d9d435fd5a05a892151a12ae5bcd3c0
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 cda885921..a2f3c3753 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 += core_headers \ + core_api.depends = gn_run + + SUBDIRS += \ + core_headers \ core_generator \ - gn_run + gn_run \ + core_api \ + core_module } else { # gyp_run.pro calls gyp through gyp_qtwebengine on the qmake step, and ninja on the make step. |