Skip to content

PR: Fix regression in FORCE_QT_API behavior from merging PySide6 support#276

Merged
dalthviz merged 3 commits intomasterfrom
unknown repository
Nov 8, 2021
Merged

PR: Fix regression in FORCE_QT_API behavior from merging PySide6 support#276
dalthviz merged 3 commits intomasterfrom
unknown repository

Conversation

@tlambert03
Copy link
Contributor

@tlambert03 tlambert03 commented Nov 8, 2021

#225 somehow reverted the fix for the broken FORCE_QT_API that was fixed in #230. presumably a merge fail... not sure if there are others

on current master (this pretty much destroys environments with multiple Qt backends)

In [1]: import PySide6

In [2]: from qtpy import QtCore

In [3]: QtCore.QTimer
Out[3]: PyQt6.QtCore.QTimer

@CAM-Gerlach CAM-Gerlach changed the title fix regression in FORCE_QT_API PR: Fix regression in FORCE_QT_API behavior from merging PySide6 support Nov 8, 2021
@CAM-Gerlach CAM-Gerlach added this to the v2.0.0 milestone Nov 8, 2021
Copy link
Member

@CAM-Gerlach CAM-Gerlach left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch, @tlambert03 , thanks! LGTM, aside from the second (EDIT: and third) commit needing a fixup (and only if @dalthviz would rather not squash-merge it).

I was going to comment on the introduced typo (and clarify the comment a bit), but you fixed the former faster than I could do so, heh.

@CAM-Gerlach
Copy link
Member

NB @dalthviz , the second and third commit either needs a fixup into the first, or the PR can simply be squash-merged, to clean up the duplicate, trivial commits.

@CAM-Gerlach CAM-Gerlach requested a review from dalthviz November 8, 2021 03:48
Copy link
Member

@dalthviz dalthviz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks @tlambert03 for noticing this and submitting a fix! LGTM 👍

@dalthviz dalthviz merged commit 403e273 into spyder-ide:master Nov 8, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants