diff options
| author | Eike Ziller <eike.ziller@qt.io> | 2022-12-16 11:02:41 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@qt.io> | 2022-12-20 10:59:30 +0000 |
| commit | 51e3c3853da4fbae842755551ed71630106fb956 (patch) | |
| tree | f0f7dbb2a2deed31a01d0c98795b54b3c76de51c | |
| parent | 8a5b941936a657fb945a34d82b45f6ee8d68ee05 (diff) | |
Revert "install_qt: Work around Qt installation including build artifacts"v6.5.0-beta1-packagingv6.4.2-packaging
This reverts commit 32041ef8cedeeabc17357af4c042ce14f2694c49.
These files are required when building against some static libraries
that Qt ships. Even though we don't link against these libraries,
starting with Qt 6.5 these files are required by the Qt CMake files. So,
if we remove them from the installation, configuration of projects with
CMake fails.
Instead of removing them from the installation, we need to remove/skip
them when deploying Qt into Qt Creator/Design Studio.
Change-Id: Ibe77599b948eb527300016f9ff0ef3e0c458a643
Reviewed-by: Tim Jenssen <tim.jenssen@qt.io>
| -rw-r--r-- | packaging-tools/install_qt.py | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/packaging-tools/install_qt.py b/packaging-tools/install_qt.py index 2ab5e0db0..1fb39181c 100644 --- a/packaging-tools/install_qt.py +++ b/packaging-tools/install_qt.py @@ -35,7 +35,7 @@ import sys from tempfile import TemporaryDirectory from typing import List, Optional -from bldinstallercommon import create_qt_download_task, patch_qt, remove_tree +from bldinstallercommon import create_qt_download_task, patch_qt from logging_util import init_logger from threadedwork import ThreadedWork @@ -120,11 +120,6 @@ def install_qt( if dl_pkgs_work.task_number != 0: dl_pkgs_work.run() patch_qt(qt_path) - # work around QTBUG-108597 (object files in installation) - for root, paths, _ in os.walk(qt_path): - for path in paths: - if path.startswith('objects-'): - remove_tree(os.path.join(root, path)) def main() -> None: |