diff options
| author | Cristián Maureira-Fredes <cristian.maureira-fredes@qt.io> | 2019-09-19 11:03:33 +0200 |
|---|---|---|
| committer | Cristián Maureira-Fredes <cristian.maureira-fredes@qt.io> | 2019-10-25 10:25:46 +0200 |
| commit | e2675b8329f2d1adc122f299aeb324a670ad4fbd (patch) | |
| tree | fd3646fe8f5119865555559721f02ffd0990f1d5 /build_scripts/platforms/windows_desktop.py | |
| parent | 0aea91d5dc3fc205e0e96fee9715253acd8bf207 (diff) | |
Replace pyside2 uic/rcc
After the compatibility patches for uic and rcc,
is now possible to generate Python code by using the option
'-g python':
uic -g python file.ui -o ui_file.py
rcc -g python file.qrc -o rc_file.py
This patch depends on many changes on the 'pyside2-tools'
submodule, which mainly remove the old implementations of pyside2-uic
and pyside2-rcc.
The pyside_tool.py wrapper is now in charge of calling the uic and rcc
binaries, with the -g python every time the pyside2-uic and pyside2-rcc
binaries are called. To achieve this, we are now shipping the uic and rcc
binaries from the Qt installation.
Fixes: PYSIDE-1098
Change-Id: Ibdec0012f7ed671cd99424e1258c20649609c2da
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@qt.io>
Diffstat (limited to 'build_scripts/platforms/windows_desktop.py')
| -rw-r--r-- | build_scripts/platforms/windows_desktop.py | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/build_scripts/platforms/windows_desktop.py b/build_scripts/platforms/windows_desktop.py index ae0d66682..ca198c582 100644 --- a/build_scripts/platforms/windows_desktop.py +++ b/build_scripts/platforms/windows_desktop.py @@ -147,25 +147,9 @@ def prepare_packages_win32(self, vars): filter=pdbs, recursive=False, vars=vars) - # <install>/lib/site-packages/pyside2uic/* -> - # <setup>/pyside2uic - copydir( - "{site_packages_dir}/pyside2uic", - "{st_build_dir}/pyside2uic", - force=False, vars=vars) - if sys.version_info[0] > 2: - rmtree("{st_build_dir}/pyside2uic/port_v2".format(**vars)) - else: - rmtree("{st_build_dir}/pyside2uic/port_v3".format(**vars)) - - # <install>/bin/pyside2-uic -> {st_package_name}/scripts/uic.py makefile( "{st_build_dir}/{st_package_name}/scripts/__init__.py", vars=vars) - copyfile( - "{install_dir}/bin/pyside2-uic", - "{st_build_dir}/{st_package_name}/scripts/uic.py", - force=False, vars=vars) # For setting up setuptools entry points copyfile( @@ -177,7 +161,7 @@ def prepare_packages_win32(self, vars): copydir( "{install_dir}/bin/", "{st_build_dir}/{st_package_name}", - filter=["pyside*.exe", "pyside*.dll"], + filter=["pyside*.exe", "pyside*.dll", "uic.exe", "rcc.exe"], recursive=False, vars=vars) # <install>/lib/*.lib -> {st_package_name}/ @@ -236,9 +220,9 @@ def prepare_packages_win32(self, vars): if sys.version_info[0] == 3: examples_path = "{st_build_dir}/{st_package_name}/examples".format( **vars) - pyside_rcc_path = "{install_dir}/bin/pyside2-rcc".format( + pyside_rcc_path = "{install_dir}/bin/rcc.exe".format( **vars) - pyside_rcc_options = '-py3' + pyside_rcc_options = '-g python' regenerate_qt_resources(examples_path, pyside_rcc_path, pyside_rcc_options) |