From 9edbe46b9932149a6eaad18530d50c1c4187f67d Mon Sep 17 00:00:00 2001 From: Alexandru Croitor Date: Tue, 16 May 2017 14:36:16 +0200 Subject: Remove duplicate installation of resource files The resources files are currently installed twice. Once in src/core.pro and once in src/core_module.pro. The core.pro installation steps should be removed, because they do not cover the macOS framework case, thus ending up with creating resources both in the framework directory, as well as in the installation root. Task-number: QTBUG-60707 Change-Id: Id0121c82d7439949474f605c6630ae045125f7ba Reviewed-by: Michal Klocek --- src/core/core.pro | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'src') diff --git a/src/core/core.pro b/src/core/core.pro index 6cc8080e0..9709e62c3 100644 --- a/src/core/core.pro +++ b/src/core/core.pro @@ -17,23 +17,6 @@ core_generator.depends = core_headers # 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 -- cgit v1.2.3