diff options
| author | Alexandru Croitor <alexandru.croitor@qt.io> | 2021-11-19 18:28:40 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2021-11-22 18:54:31 +0000 |
| commit | 06d12ff91f30b97d23f5c57ff76962ce068ae96c (patch) | |
| tree | 3a8e83dcf9ddb0978b1924fd58a36c89d20f0935 | |
| parent | 2681218966d04485c6c24ea8a90e09750b1e0cec (diff) | |
setup.py: Package QtWebEngine resources from Qt's data dir
The QtWebEngine resources are not necessarily in $qt_prefix/resources.
On Linux, distro's might specify a different value for
QT_INSTALL_DATA.
Make sure to use that value.
Change-Id: I5bed723de07d39d0bc72e7932161809150433037
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit 2d3758754337c673e459dfafe7db20462fa7acb2)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | build_scripts/main.py | 1 | ||||
| -rw-r--r-- | build_scripts/platforms/linux.py | 2 | ||||
| -rw-r--r-- | build_scripts/platforms/macos.py | 2 | ||||
| -rw-r--r-- | build_scripts/platforms/windows_desktop.py | 2 | ||||
| -rw-r--r-- | build_scripts/qtinfo.py | 4 |
5 files changed, 8 insertions, 3 deletions
diff --git a/build_scripts/main.py b/build_scripts/main.py index 586e58d0a..f16a59bf5 100644 --- a/build_scripts/main.py +++ b/build_scripts/main.py @@ -943,6 +943,7 @@ class PysideBuild(_build, DistUtilsCommandMixin): "py_version": self.py_version, "qt_version": self.qtinfo.version, "qt_bin_dir": self.qtinfo.bins_dir, + "qt_data_dir": self.qtinfo.data_dir, "qt_doc_dir": self.qtinfo.docs_dir, "qt_lib_dir": self.qtinfo.libs_dir, "qt_lib_execs_dir": self.qtinfo.lib_execs_dir, diff --git a/build_scripts/platforms/linux.py b/build_scripts/platforms/linux.py index 092660072..324b962db 100644 --- a/build_scripts/platforms/linux.py +++ b/build_scripts/platforms/linux.py @@ -97,7 +97,7 @@ def prepare_standalone_package_linux(self, vars): linux_patch_executable(self._patchelf_path, designer_path) if self.is_webengine_built(built_modules): - copydir("{qt_prefix_dir}/resources", + copydir("{qt_data_dir}/resources", "{st_build_dir}/{st_package_name}/Qt/resources", filter=None, recursive=False, diff --git a/build_scripts/platforms/macos.py b/build_scripts/platforms/macos.py index dcbaff3a3..43a5f58d2 100644 --- a/build_scripts/platforms/macos.py +++ b/build_scripts/platforms/macos.py @@ -160,7 +160,7 @@ def prepare_standalone_package_macos(self, vars): recursive=True, vars=vars, force_copy_symlinks=True) if self.is_webengine_built(built_modules): - copydir("{qt_prefix_dir}/resources", + copydir("{qt_data_dir}/resources", "{st_build_dir}/{st_package_name}/Qt/resources", filter=None, recursive=False, diff --git a/build_scripts/platforms/windows_desktop.py b/build_scripts/platforms/windows_desktop.py index 70c2fbfb6..b393afcfe 100644 --- a/build_scripts/platforms/windows_desktop.py +++ b/build_scripts/platforms/windows_desktop.py @@ -469,7 +469,7 @@ def copy_qt_artifacts(self, copy_pdbs, vars): vars=vars) if self.is_webengine_built(built_modules): - copydir("{qt_prefix_dir}/resources", + copydir("{qt_data_dir}/resources", "{st_build_dir}/{st_package_name}/resources", filter=None, recursive=False, diff --git a/build_scripts/qtinfo.py b/build_scripts/qtinfo.py index d49bb5aac..94d216fb9 100644 --- a/build_scripts/qtinfo.py +++ b/build_scripts/qtinfo.py @@ -105,6 +105,10 @@ class QtInfo(object): return self.get_property("QT_INSTALL_BINS") @property + def data_dir(self): + return self.get_property("QT_INSTALL_DATA") + + @property def libs_dir(self): return self.get_property("QT_INSTALL_LIBS") |