Skip to content

Handle ETSConfig.toolkit == 'qt'#587

Merged
jwiggins merged 1 commit into
masterfrom
fix/qt-toolkit
Feb 15, 2021
Merged

Handle ETSConfig.toolkit == 'qt'#587
jwiggins merged 1 commit into
masterfrom
fix/qt-toolkit

Conversation

@jwiggins

Copy link
Copy Markdown
Member

Missed this in #571. The majority of the Qt toolkit conditionals were checking ETSConfig.toolkit == "qt4". This PR switches to ETSConfig.toolkit.startswith("qt") instead.

@rahulporuri, @aaronayres35: This should be cherry-picked into the 5.0.0 branch.

@jwiggins jwiggins requested a review from rahulporuri February 15, 2021 11:09

@rahulporuri rahulporuri left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

LGTM 🎉 🙏

@jwiggins

Copy link
Copy Markdown
Member Author

Turns out a release candidate is as good idea 😅

@jwiggins jwiggins merged commit 9f235da into master Feb 15, 2021
@jwiggins jwiggins deleted the fix/qt-toolkit branch February 15, 2021 11:37
jwiggins added a commit that referenced this pull request Feb 15, 2021
jwiggins added a commit that referenced this pull request Feb 15, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants