diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-03-20 13:50:46 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-03-22 22:02:15 +0000 |
| commit | c5282c3479294f8d1c3ce310585aa9e3a8c4f4d7 (patch) | |
| tree | bf4141bdf2aa48b69786d66514b4319a211462c7 /src/core/core.pro | |
| parent | cd776aebe0a6505141b0392b79cca117de3c5ac3 (diff) | |
Remove gyp handling
Remove now dead GYP related code.
Change-Id: I7d5b8f28f8925e553211dc88acd571b605ffe80d
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'src/core/core.pro')
| -rw-r--r-- | src/core/core.pro | 90 |
1 files changed, 31 insertions, 59 deletions
diff --git a/src/core/core.pro b/src/core/core.pro index a2f3c3753..85e090ca9 100644 --- a/src/core/core.pro +++ b/src/core/core.pro @@ -14,62 +14,34 @@ 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 - - core_api.depends = gn_run - - SUBDIRS += \ - core_headers \ - core_generator \ - 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. - gyp_run.file = gyp_run.pro - gyp_run.depends = core_generator - core_api.depends = gyp_run - - SUBDIRS += core_headers \ - core_generator - - !win32 { - # gyp_configure_host.pro and gyp_configure_target.pro are phony pro files that - # extract things like compiler and linker from qmake - # Do not use them on Windows, where Qt already expects the toolchain to be - # selected through environment varibles. - gyp_configure_host.file = gyp_configure_host.pro - gyp_configure_target.file = gyp_configure_target.pro - gyp_configure_target.depends = gyp_configure_host - - gyp_run.depends += gyp_configure_host gyp_configure_target - SUBDIRS += gyp_configure_host gyp_configure_target - } - - SUBDIRS += gyp_run \ - core_api \ - core_module -} +# 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 + +core_api.depends = gn_run + +SUBDIRS += \ + core_headers \ + core_generator \ + gn_run \ + core_api \ + core_module |