diff options
-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") |