From 04d5a9da1f8d6795b96023865767be24554af04d Mon Sep 17 00:00:00 2001
From: Friedemann Kleint <Friedemann.Kleint@qt.io>
Date: Tue, 21 Dec 2021 14:34:37 +0100
Subject: 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>
---
 build_scripts/config.py                    | 3 +++
 build_scripts/platforms/unix.py            | 4 ++--
 build_scripts/platforms/windows_desktop.py | 3 ++-
 sources/pyside-tools/CMakeLists.txt        | 4 +++-
 sources/pyside-tools/pyside_tool.py        | 8 ++++++++
 5 files changed, 18 insertions(+), 4 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/",
diff --git a/sources/pyside-tools/CMakeLists.txt b/sources/pyside-tools/CMakeLists.txt
index 75f5f8e77..f4667c479 100644
--- a/sources/pyside-tools/CMakeLists.txt
+++ b/sources/pyside-tools/CMakeLists.txt
@@ -17,8 +17,10 @@ if(NOT NO_QT_TOOLS STREQUAL "yes")
 
     list(APPEND files "${LIBEXEC_PATH}/uic${CMAKE_EXECUTABLE_SUFFIX}"
                       "${LIBEXEC_PATH}/rcc${CMAKE_EXECUTABLE_SUFFIX}"
+                      "${LIBEXEC_PATH}/qmltyperegistrar${CMAKE_EXECUTABLE_SUFFIX}"
                       "${TOOLS_PATH}/lrelease${CMAKE_EXECUTABLE_SUFFIX}"
-                      "${TOOLS_PATH}/lupdate${CMAKE_EXECUTABLE_SUFFIX}")
+                      "${TOOLS_PATH}/lupdate${CMAKE_EXECUTABLE_SUFFIX}"
+                      "${TOOLS_PATH}/qmllint${CMAKE_EXECUTABLE_SUFFIX}")
 
     if (APPLE)
         list(APPEND directories "${TOOLS_PATH}/Assistant.app"
diff --git a/sources/pyside-tools/pyside_tool.py b/sources/pyside-tools/pyside_tool.py
index 5045c40c7..aa73affd0 100644
--- a/sources/pyside-tools/pyside_tool.py
+++ b/sources/pyside-tools/pyside_tool.py
@@ -91,6 +91,14 @@ def rcc():
     qt_tool_wrapper("rcc", ['-g', 'python'] + sys.argv[1:], True)
 
 
+def qmltyperegistrar():
+    qt_tool_wrapper("qmltyperegistrar", sys.argv[1:], True)
+
+
+def qmllint():
+    qt_tool_wrapper("qmllint", sys.argv[1:])
+
+
 def assistant():
     qt_tool_wrapper("assistant", sys.argv[1:])
 
-- 
cgit v1.2.3