aboutsummaryrefslogtreecommitdiffstats
path: root/build_scripts
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2021-02-05 17:06:16 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2021-02-16 13:35:45 +0000
commit82afd88245a17b6ba759937a2b391c216857565a (patch)
tree1700964ad26a47e30e470fe679a80c72da17a26a /build_scripts
parentb9aa61247c355a9330e52059951649c6ba7697c2 (diff)
PySide6: Add a Designer plugin
Add a convencience class QPyDesignerCustomWidgetCollection to the Qt Designer module, which provides functions for registering widget types or adding QDesignerCustomWidgetInterface instances. A static instance of it is stored as a dynamic property on QCoreApplication, which is retrieved by a Qt Designer plugin, which provides the collection of widgets registered in Python. Task-number: PYSIDE-1455 Change-Id: If4055e6c9db6a03b32016b013a1130051bbd472a Reviewed-by: Cristian Maureira-Fredes <cristian.maureira-fredes@qt.io>
Diffstat (limited to 'build_scripts')
-rw-r--r--build_scripts/platforms/linux.py9
-rw-r--r--build_scripts/platforms/windows_desktop.py8
2 files changed, 14 insertions, 3 deletions
diff --git a/build_scripts/platforms/linux.py b/build_scripts/platforms/linux.py
index e7abeb062..cafddbc07 100644
--- a/build_scripts/platforms/linux.py
+++ b/build_scripts/platforms/linux.py
@@ -112,11 +112,16 @@ def prepare_standalone_package_linux(self, vars):
if copy_plugins:
# <qt>/plugins/* -> <setup>/{st_package_name}/Qt/plugins
- copydir("{qt_plugins_dir}",
- "{st_build_dir}/{st_package_name}/Qt/plugins",
+ plugins_target = "{st_build_dir}/{st_package_name}/Qt/plugins"
+ copydir("{qt_plugins_dir}", plugins_target,
filter=["*.so"],
recursive=True,
vars=vars)
+ 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 fb0e53972..8786f138c 100644
--- a/build_scripts/platforms/windows_desktop.py
+++ b/build_scripts/platforms/windows_desktop.py
@@ -416,14 +416,20 @@ def copy_qt_artifacts(self, copy_pdbs, vars):
if copy_plugins:
# <qt>/plugins/* -> <setup>/{st_package_name}/plugins
+ plugins_target = "{st_build_dir}/{st_package_name}/plugins"
plugin_dll_patterns = ["*{}.dll"]
pdb_pattern = "*{}.pdb"
if copy_pdbs:
plugin_dll_patterns += [pdb_pattern]
plugin_dll_filter = functools.partial(qt_build_config_filter, plugin_dll_patterns)
- copydir("{qt_plugins_dir}", "{st_build_dir}/{st_package_name}/plugins",
+ copydir("{qt_plugins_dir}", plugins_target,
file_filter_function=plugin_dll_filter,
vars=vars)
+ 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