diff options
-rw-r--r-- | build_scripts/config.py | 2 | ||||
-rw-r--r-- | build_scripts/platforms/unix.py | 2 | ||||
-rw-r--r-- | build_scripts/platforms/windows_desktop.py | 2 | ||||
-rw-r--r-- | create_wheels.py | 1 | ||||
-rw-r--r-- | sources/pyside-tools/CMakeLists.txt | 1 | ||||
-rw-r--r-- | sources/pyside-tools/pyside_tool.py | 4 |
6 files changed, 9 insertions, 3 deletions
diff --git a/build_scripts/config.py b/build_scripts/config.py index 11967ba06..6590dcc9d 100644 --- a/build_scripts/config.py +++ b/build_scripts/config.py @@ -202,7 +202,7 @@ class Config(object): _pyside_tools = ["uic", "rcc", "assistant", "designer", "linguist", "lupdate", "lrelease", "genpyi", "metaobjectdump", "project", "qml", "qmltyperegistrar", "qmllint", "qmlformat", "qmlls", - "qtpy2cpp", "deploy"] + "qtpy2cpp", "deploy", "qmlimportscanner"] setup_kwargs['entry_points'] = { 'console_scripts': [f'{PYSIDE}-{tool} = {package_name}.scripts.pyside_tool:{tool}' diff --git a/build_scripts/platforms/unix.py b/build_scripts/platforms/unix.py index c13bdb4ab..e7bdb7a70 100644 --- a/build_scripts/platforms/unix.py +++ b/build_scripts/platforms/unix.py @@ -132,7 +132,7 @@ def prepare_packages_posix(self, _vars, cross_build=False): lib_exec_filters = [] if not OPTION['NO_QT_TOOLS']: - lib_exec_filters.extend(['uic', 'rcc', 'qmltyperegistrar']) + lib_exec_filters.extend(['uic', 'rcc', 'qmltyperegistrar', 'qmlimportscanner']) executables.extend(copydir( "{install_dir}/bin/", "{st_build_dir}/{st_package_name}", diff --git a/build_scripts/platforms/windows_desktop.py b/build_scripts/platforms/windows_desktop.py index b5654b614..d9392a79a 100644 --- a/build_scripts/platforms/windows_desktop.py +++ b/build_scripts/platforms/windows_desktop.py @@ -134,7 +134,7 @@ def prepare_packages_win32(self, _vars): if not OPTION['NO_QT_TOOLS']: filters.extend(["lrelease.exe", "lupdate.exe", "uic.exe", "rcc.exe", "qmllint.exe", "qmltyperegistrar.exe" - "assistant.exe", "designer.exe", + "assistant.exe", "designer.exe", "qmlimportscanner.exe", "linguist.exe", "qmlformat.exe", "qmlls.exe"]) copydir( "{install_dir}/bin/", diff --git a/create_wheels.py b/create_wheels.py index 0a34405c9..6b0f0887d 100644 --- a/create_wheels.py +++ b/create_wheels.py @@ -205,6 +205,7 @@ def wheel_pyside6_essentials() -> Tuple[SetupData, List[ModuleData]]: "pyside6-metaobjectdump = PySide6.scripts.pyside_tool:metaobjectdump", "pyside6-project = PySide6.scripts.pyside_tool:project", "pyside6-qmltyperegistrar = PySide6.scripts.pyside_tool:qmltyperegistrar", + "pyside6-qmlimportscanner = PySide6.scripts.pyside_tool:qmlimportscanner", "pyside6-qmllint = PySide6.scripts.pyside_tool:qmllint", "pyside6-qml = PySide6.scripts.pyside_tool:qml", "pyside6-qmlformat = PySide6.scripts.pyside_tool:qmlformat", diff --git a/sources/pyside-tools/CMakeLists.txt b/sources/pyside-tools/CMakeLists.txt index 13fd752d2..87c33926c 100644 --- a/sources/pyside-tools/CMakeLists.txt +++ b/sources/pyside-tools/CMakeLists.txt @@ -20,6 +20,7 @@ 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}" + "${LIBEXEC_PATH}/qmlimportscanner${CMAKE_EXECUTABLE_SUFFIX}" "${TOOLS_PATH}/lrelease${CMAKE_EXECUTABLE_SUFFIX}" "${TOOLS_PATH}/lupdate${CMAKE_EXECUTABLE_SUFFIX}" "${TOOLS_PATH}/qmllint${CMAKE_EXECUTABLE_SUFFIX}" diff --git a/sources/pyside-tools/pyside_tool.py b/sources/pyside-tools/pyside_tool.py index f8e4ab415..f442ee254 100644 --- a/sources/pyside-tools/pyside_tool.py +++ b/sources/pyside-tools/pyside_tool.py @@ -74,6 +74,10 @@ def qmltyperegistrar(): qt_tool_wrapper("qmltyperegistrar", sys.argv[1:], True) +def qmlimportscanner(): + qt_tool_wrapper("qmlimportscanner", sys.argv[1:], True) + + def qmllint(): qt_tool_wrapper("qmllint", sys.argv[1:]) |