aboutsummaryrefslogtreecommitdiffstats
path: root/build_scripts/main.py
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2021-11-19 18:28:40 +0100
committerAlexandru Croitor <alexandru.croitor@qt.io>2021-11-22 18:28:38 +0100
commit2d3758754337c673e459dfafe7db20462fa7acb2 (patch)
treecd59955333f7ed2426694f50ded9e9510cf1d93c /build_scripts/main.py
parentcff76d051133a5c8ff95f272134f7ee55f57bceb (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. Pick-to: 6.2 Change-Id: I5bed723de07d39d0bc72e7932161809150433037 Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org> Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'build_scripts/main.py')
-rw-r--r--build_scripts/main.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/build_scripts/main.py b/build_scripts/main.py
index 4e341e26a..92a0ac1f4 100644
--- a/build_scripts/main.py
+++ b/build_scripts/main.py
@@ -955,6 +955,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,