diff options
| author | Cristián Maureira-Fredes <Cristian.Maureira-Fredes@qt.io> | 2021-08-31 10:23:10 +0200 |
|---|---|---|
| committer | Simo Fält <simo.falt@qt.io> | 2021-09-01 09:36:00 +0000 |
| commit | cfcabf7a12a2426410de69d882b882c11306cfe7 (patch) | |
| tree | 7c18d43eb11f317ba88840fe71837c7d2dd3e66b | |
| parent | f40dfe83e811584062fa742c7ae2f251de62b723 (diff) | |
The new version will be added in 6.2, and some changes
were pushed to 6.1 but they were not working.
Change-Id: I0ce85b1ebcfcba6bd0d683fa543bc8fdd7e4d080
Reviewed-by: Christian Tismer <tismer@stackless.com>
(cherry picked from commit 897e5d4651abb3e1c7b131a0ec10e011b2b187ce)
| -rw-r--r-- | build_scripts/config.py | 1 | ||||
| -rw-r--r-- | build_scripts/platforms/unix.py | 7 | ||||
| -rw-r--r-- | build_scripts/platforms/windows_desktop.py | 1 | ||||
| -rw-r--r-- | sources/pyside-tools/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | sources/pyside-tools/pyside_tool.py | 13 |
5 files changed, 1 insertions, 23 deletions
diff --git a/build_scripts/config.py b/build_scripts/config.py index d3b9a38b1..8cb5e6301 100644 --- a/build_scripts/config.py +++ b/build_scripts/config.py @@ -217,7 +217,6 @@ class Config(object): f'{PYSIDE}-uic = {package_name}.scripts.pyside_tool:uic', f'{PYSIDE}-rcc = {package_name}.scripts.pyside_tool:rcc', f'{PYSIDE}-designer= {package_name}.scripts.pyside_tool:designer', - f'{PYSIDE}-lupdate = {package_name}.scripts.pyside_tool:main', f'{PYSIDE}-genpyi = {package_name}.scripts.pyside_tool:genpyi', ] } diff --git a/build_scripts/platforms/unix.py b/build_scripts/platforms/unix.py index 6698cdc13..59d7e599b 100644 --- a/build_scripts/platforms/unix.py +++ b/build_scripts/platforms/unix.py @@ -128,13 +128,6 @@ def prepare_packages_posix(self, vars): "{st_build_dir}/{st_package_name}/scripts/pyside_tool.py", force=False, vars=vars) - # <install>/bin/* -> {st_package_name}/ - executables.extend(copydir( - "{install_dir}/bin/", - "{st_build_dir}/{st_package_name}", - filter=[f"{PYSIDE}-lupdate"], - recursive=False, vars=vars)) - if not OPTION['NO_QT_TOOLS']: executables.extend(copydir( "{install_dir}/bin/", diff --git a/build_scripts/platforms/windows_desktop.py b/build_scripts/platforms/windows_desktop.py index b76f5d1b8..f34433e2b 100644 --- a/build_scripts/platforms/windows_desktop.py +++ b/build_scripts/platforms/windows_desktop.py @@ -314,7 +314,6 @@ def copy_qt_artifacts(self, copy_pdbs, vars): "designer.exe", "linguist.exe", "lrelease.exe", - "lupdate.exe", "lconvert.exe", "qtdiag.exe" ] diff --git a/sources/pyside-tools/CMakeLists.txt b/sources/pyside-tools/CMakeLists.txt index 559c9faa1..26c126da1 100644 --- a/sources/pyside-tools/CMakeLists.txt +++ b/sources/pyside-tools/CMakeLists.txt @@ -54,7 +54,7 @@ if(NOT NO_QT_TOOLS STREQUAL "yes") endif() -# pyside6-rcc, pyside6-uic, pyside6-designer, shiboken and pyside6-lupdate entrypoints +# pyside6-rcc, pyside6-uic, pyside6-designer, and shiboken entrypoints install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/pyside_tool.py DESTINATION bin PERMISSIONS diff --git a/sources/pyside-tools/pyside_tool.py b/sources/pyside-tools/pyside_tool.py index 6a47d3632..13b9ab24a 100644 --- a/sources/pyside-tools/pyside_tool.py +++ b/sources/pyside-tools/pyside_tool.py @@ -48,15 +48,6 @@ from subprocess import Popen, PIPE import PySide6 as ref_mod -def main(): - # This will take care of "pyside6-lupdate" listed as an entrypoint - # in setup.py are copied to 'scripts/..' - cmd = os.path.join("..", os.path.basename(sys.argv[0])) - command = [os.path.join(os.path.dirname(os.path.realpath(__file__)), cmd)] - command.extend(sys.argv[1:]) - sys.exit(subprocess.call(command)) - - def qt_tool_wrapper(qt_tool, args): # Taking care of pyside6-uic, pyside6-rcc, and pyside6-designer # listed as an entrypoint in setup.py @@ -134,7 +125,3 @@ def genpyi(): cmd = support / "generate_pyi.py" command = [sys.executable, os.fspath(cmd)] + sys.argv[1:] sys.exit(subprocess.call(command)) - - -if __name__ == "__main__": - main() |