Skip to content

Comments

PyQt5, PyQt6, PySide6 Shim (Switch between different Python bindings for Qt versions)#5885

Open
jonoomph wants to merge 34 commits intodevelopfrom
qt6-support
Open

PyQt5, PyQt6, PySide6 Shim (Switch between different Python bindings for Qt versions)#5885
jonoomph wants to merge 34 commits intodevelopfrom
qt6-support

Conversation

@jonoomph
Copy link
Member

…nd. Also, adding a new QT version shim, although we aren't using it quite yet.
@jonoomph
Copy link
Member Author

@github-actions
Copy link

github-actions bot commented Feb 2, 2026

Merge conflicts have been detected on this PR, please resolve.

@github-actions github-actions bot added the conflicts A PR with unresolved merge conflicts label Feb 2, 2026
# Conflicts:
#	src/windows/add_to_timeline.py
#	src/windows/animated_title.py
#	src/windows/export.py
#	src/windows/main_window.py
#	src/windows/models/emoji_model.py
#	src/windows/models/files_model.py
#	src/windows/models/titles_model.py
#	src/windows/models/transition_model.py
#	src/windows/profile_edit.py
#	src/windows/views/effects_listview.py
#	src/windows/views/emojis_listview.py
#	src/windows/views/files_listview.py
#	src/windows/views/properties_tableview.py
#	src/windows/views/timeline_backend/qwidget/track.py
#	src/windows/views/titles_listview.py
#	src/windows/views/transitions_listview.py
…g on a few models (transitions, effects, files)
…r a consistent look on all widget libraries).
…ing QPointF correctly, ending QPainter correctly)
…Thumbnail view) - since they are single selection only lists
…due to large Arm64 memory addresses (PySide6 forces int() which breaks the pointers in an overflow error)
# Conflicts:
#	src/windows/export_clips.py
#	src/windows/main_window.py
#	src/windows/preview_thread.py
#	src/windows/title_editor.py
#	src/windows/views/emojis_listview.py
#	src/windows/views/files_listview.py
#	src/windows/views/files_treeview.py
#	src/windows/views/timeline_backend/paint/base.py
#	src/windows/views/timeline_backend/qwidget/base.py
#	src/windows/views/timeline_backend/qwidget/thumbnails.py
#	src/windows/views/timeline_backend/theme.py
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

conflicts A PR with unresolved merge conflicts

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant