aboutsummaryrefslogtreecommitdiffstats
path: root/build_scripts/qtinfo.py
diff options
context:
space:
mode:
authorAlexandru Croitor <alexandru.croitor@qt.io>2021-11-19 18:28:40 +0100
committerQt Cherry-pick Bot <cherrypick_bot@qt-project.org>2021-11-22 18:54:31 +0000
commit06d12ff91f30b97d23f5c57ff76962ce068ae96c (patch)
tree3a8e83dcf9ddb0978b1924fd58a36c89d20f0935 /build_scripts/qtinfo.py
parent2681218966d04485c6c24ea8a90e09750b1e0cec (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>
Diffstat (limited to 'build_scripts/qtinfo.py')
-rw-r--r--build_scripts/qtinfo.py4
1 files changed, 4 insertions, 0 deletions
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")