Loading...

XML

Word

Printable

Details

Type: Bug
Resolution: Fixed
Priority: P4: Low
Fix Version/s: None
Affects Version/s: 6.5
Component/s: Other
Labels:
- RTA

Commits:
74d8c937f (tqtc/lts-6.5), 574ae4fc8 (tqtc/lts-6.5.9), 574afc53d (tqtc/6.5.9)

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