diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2023-09-12 08:56:34 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2023-09-13 15:18:49 +0000 |
| commit | 58b005a128fb262dea5d1fedac0ba43b152a3baa (patch) | |
| tree | 87b349b3f6e520723a3d5e18e65eb00b90d34ba6 | |
| parent | 2650748f5c3bebef66ace5275d85de2de2b66415 (diff) | |
Build scripts: Fix "modules" directory for Qt builds with --archdata-dir
"modules" is relative to arch data.
Fixes: PYSIDE-2461
Task-number: QTBUG-116983
Change-Id: Ibb91934cc13c164cbba208989e8583248a69115f
Reviewed-by: Adrian Herrmann <adrian.herrmann@qt.io>
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
(cherry picked from commit 1ad0fa5b050674c54eeaf9a7a02486ca6dec8878)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | build_scripts/qtinfo.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build_scripts/qtinfo.py b/build_scripts/qtinfo.py index 46ee27a94..1eb7c4909 100644 --- a/build_scripts/qtinfo.py +++ b/build_scripts/qtinfo.py @@ -75,8 +75,8 @@ class QtInfo(object): @property def module_json_files_dir(self): - install_libs = self.get_property("QT_INSTALL_LIBS") - result = Path(install_libs).parent / "modules" + # FIXME: Use INSTALL_DESCRIPTIONSDIR once QTBUG-116983 is done. + result = Path(self.arch_data) / "modules" return os.fspath(result) @property |