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/config.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/config.py')
| -rw-r--r-- | build_scripts/config.py | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/build_scripts/config.py b/build_scripts/config.py index f32dccbfd..7fa3b486b 100644 --- a/build_scripts/config.py +++ b/build_scripts/config.py @@ -213,8 +213,8 @@ class Config(object): setup_kwargs['install_requires'] = ["{}=={}".format(self.shiboken_module_st_name, package_version)] setup_kwargs['entry_points'] = { 'console_scripts': [ - 'pyside2-uic = {}.scripts.uic:main'.format(self.package_name()), - 'pyside2-rcc = {}.scripts.pyside_tool:main'.format(self.package_name()), + 'pyside2-uic = {}.scripts.pyside_tool:uic'.format(self.package_name()), + 'pyside2-rcc = {}.scripts.pyside_tool:rcc'.format(self.package_name()), 'pyside2-lupdate = {}.scripts.pyside_tool:main'.format(self.package_name()), ] } @@ -288,9 +288,6 @@ class Config(object): if self.internal_build_type == self.pyside_option_name: return [ config.package_name(), - 'pyside2uic', - 'pyside2uic.Compiler', - 'pyside2uic.port_v{}'.format(sys.version_info[0]) ] elif self.internal_build_type == self.shiboken_module_option_name: return [self.package_name()] @@ -321,7 +318,6 @@ class Config(object): elif self.is_internal_pyside_build(): return { self.package_name(): "sources/pyside2/PySide2", - "pyside2uic": "sources/pyside2-tools/pyside2uic" } else: return {} |