Details
P4: Low Description
Pyside 6.5.9
There is some merging related garbage:
<<<<<<< HEAD (9e731a pyside_tool.py: Work around console encoding issues on Windo) . . code . . >>>>>>> CHANGE (e0e83b examples: fix flake8 issues and add exceptions)
in these examples:
Src/examples/multimedia/camera/camera.py
Src/examples/webenginewidgets/simplebrowser/main.py
Src/examples/gui/rhiwindow/main.py
Src/examples/sql/books/main.py
Src/examples/quick3d/proceduraltexture/main.py
The automated tests choke on those lines with:
<<<<<<< HEAD (9e731a pyside_tool.py: Work around console encoding issues on Windo)
^
SyntaxError: invalid decimal literal
Attachments
| For Gerrit Dashboard: PYSIDE-3100 | ||||||
|---|---|---|---|---|---|---|
| # | Subject | Branch | Project | Status | CR | V |
| 646046,2 | Fix merge related garbage in examples | tqtc/lts-6.5 | pyside/tqtc-pyside-setup | Status: MERGED | -1 | 0 |
| 647781,2 | Fix merge related garbage in examples | tqtc/6.5.9 | pyside/tqtc-pyside-setup | Status: MERGED | -1 | 0 |
| 648318,2 | Fix merge related garbage in examples | tqtc/lts-6.5.9 | pyside/tqtc-pyside-setup | Status: MERGED | -1 | 0 |