aboutsummaryrefslogtreecommitdiffstats
path: root/build_scripts
diff options
context:
space:
mode:
authorFriedemann Kleint <Friedemann.Kleint@qt.io>2021-12-21 14:34:37 +0100
committerFriedemann Kleint <Friedemann.Kleint@qt.io>2022-01-18 16:33:25 +0100
commit04d5a9da1f8d6795b96023865767be24554af04d (patch)
treef4c9c69568e0de7e8de794517d40c823befa0524 /build_scripts
parent838ba27346f66efabb1b952e9f61a8eff7c99235 (diff)
Add qmltyperegistrar/qmllint
Add entry points for the tools from libexec or bin, respectively. [ChangeLog][PySide6] The tools pyside6-qmltyperegistrar and pyside6-qmllint have been added. Task-number: PYSIDE-1709 Change-Id: If578255cc2a0fda4171b1ed54f3a2e612e849964 Reviewed-by: Christian Tismer <tismer@stackless.com>
Diffstat (limited to 'build_scripts')
-rw-r--r--build_scripts/config.py3
-rw-r--r--build_scripts/platforms/unix.py4
-rw-r--r--build_scripts/platforms/windows_desktop.py3
3 files changed, 7 insertions, 3 deletions
diff --git a/build_scripts/config.py b/build_scripts/config.py
index 7a42f7cc7..0a48e84b6 100644
--- a/build_scripts/config.py
+++ b/build_scripts/config.py
@@ -223,6 +223,9 @@ class Config(object):
f'{PYSIDE}-lupdate = {package_name}.scripts.pyside_tool:lupdate',
f'{PYSIDE}-lrelease = {package_name}.scripts.pyside_tool:lrelease',
f'{PYSIDE}-genpyi = {package_name}.scripts.pyside_tool:genpyi',
+ f'{PYSIDE}-moc = {package_name}.scripts.pyside_tool:moc',
+ f'{PYSIDE}-qmltyperegistrar = {package_name}.scripts.pyside_tool:qmltyperegistrar',
+ f'{PYSIDE}-qmllint = {package_name}.scripts.pyside_tool:qmllint'
]
}
self.setup_kwargs = setup_kwargs
diff --git a/build_scripts/platforms/unix.py b/build_scripts/platforms/unix.py
index 7b2b716ac..57163e58f 100644
--- a/build_scripts/platforms/unix.py
+++ b/build_scripts/platforms/unix.py
@@ -163,11 +163,11 @@ def prepare_packages_posix(self, vars):
lib_exec_filters = []
if not OPTION['NO_QT_TOOLS']:
- lib_exec_filters.extend(['uic', 'rcc'])
+ lib_exec_filters.extend(['uic', 'rcc', 'qmltyperegistrar'])
executables.extend(copydir(
"{install_dir}/bin/",
"{st_build_dir}/{st_package_name}",
- filter=["lrelease", "lupdate"],
+ filter=["lrelease", "lupdate", "qmllint"],
recursive=False, vars=vars))
# Copying assistant/designer
executables.extend(_copy_gui_executable('assistant', vars=vars))
diff --git a/build_scripts/platforms/windows_desktop.py b/build_scripts/platforms/windows_desktop.py
index f5b7feff2..b57b82828 100644
--- a/build_scripts/platforms/windows_desktop.py
+++ b/build_scripts/platforms/windows_desktop.py
@@ -161,7 +161,8 @@ def prepare_packages_win32(self, vars):
filters = ["pyside*.exe", "pyside*.dll"]
if not OPTION['NO_QT_TOOLS']:
filters.extend(["lrelease.exe", "lupdate.exe", "uic.exe",
- "rcc.exe", "assistant.exe", "designer.exe",
+ "rcc.exe", "qmllint.exe", "qmltyperegistrar.exe"
+ "assistant.exe", "designer.exe",
"linguist.exe"])
copydir(
"{install_dir}/bin/",