diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-04-08 14:59:28 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2021-04-11 11:59:32 +0200 |
| commit | 67c1f6f0bb76fbbdf0e866f8f61d3afe079e741d (patch) | |
| tree | 236407de8fda49634798832f3c79d40908cad4c8 /build_scripts | |
| parent | bce03cee3bd654bebf693ef5c4e7016d539c38f8 (diff) | |
Revert "Temporarily disable the designer plugin"
The underlying bug has been fixed in Qt.
This reverts commit 54f8953d629fd97460c82c977ba81d95f0dc5235.
Task-number: QTBUG-92361
Task-number: PYSIDE-1455
Change-Id: I904074685121c2bec87ba23697401a1bd93947fb
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'build_scripts')
| -rw-r--r-- | build_scripts/platforms/linux.py | 6 | ||||
| -rw-r--r-- | build_scripts/platforms/windows_desktop.py | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/build_scripts/platforms/linux.py b/build_scripts/platforms/linux.py index f30f39667..cafddbc07 100644 --- a/build_scripts/platforms/linux.py +++ b/build_scripts/platforms/linux.py @@ -117,7 +117,11 @@ def prepare_standalone_package_linux(self, vars): filter=["*.so"], recursive=True, vars=vars) - # FIXME QTBUG-92361: Bring back the designer plugin + copydir("{install_dir}/plugins/designer", + f"{plugins_target}/designer", + filter=["*.so"], + recursive=False, + vars=vars) if copy_qml: # <qt>/qml/* -> <setup>/{st_package_name}/Qt/qml diff --git a/build_scripts/platforms/windows_desktop.py b/build_scripts/platforms/windows_desktop.py index ffcd6612c..b76f5d1b8 100644 --- a/build_scripts/platforms/windows_desktop.py +++ b/build_scripts/platforms/windows_desktop.py @@ -428,7 +428,11 @@ def copy_qt_artifacts(self, copy_pdbs, vars): copydir("{qt_plugins_dir}", plugins_target, file_filter_function=plugin_dll_filter, vars=vars) - # FIXME QTBUG-92361: Bring back the designer plugin + copydir("{install_dir}/plugins/designer", + f"{plugins_target}/designer", + filter=["*.dll"], + recursive=False, + vars=vars) if copy_translations: # <qt>/translations/* -> <setup>/{st_package_name}/translations |