/matplotlib

Fix about dialog on Qt 5 #6124

Merged
merged 1 commit into from Mar 7, 2016

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
  v1.5.2
4 participants
@estan @tacaswell @QuLogic @mdboom
@estan
Contributor

estan commented Mar 7, 2016

QMessageBox is in QtWidgets, not QtGui.

mdboom added the needs_review label Mar 7, 2016

@QuLogic QuLogic and 1 other commented on an outdated diff Mar 7, 2016

View full outdated diff
examples/user_interfaces/embedding_in_qt5.py
@@ -117,7 +117,7 @@ def closeEvent(self, ce):
self.fileQuit()
def about(self):
- QtGui.QMessageBox.about(self, "About",
+ QtWidgets.QMessageBox.about(self, "About",
"""embedding_in_qt5.py example
@QuLogic

QuLogic Mar 7, 2016

Member

This line needs to be re-aligned with the opening parentheses above.

@estan

estan Mar 7, 2016

Contributor

Ah, sorry about that. Commit updated. I also removed the now unused import of QtGui.
@estan estan Fix about dialog on Qt 5 
QMessageBox is in QtWidgets, not QtGui.

All checks have passed

2 successful checks
continuous-integration/appveyor/pr — AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr — The Travis CI build passed
Details
b0112a4

@tacaswell tacaswell added a commit that referenced this pull request Mar 7, 2016

@tacaswell tacaswell Merge pull request #6124 from estan/qt5-example-fixes 
Fix about dialog on Qt 5
 6ea5e35

@tacaswell tacaswell merged commit 6ea5e35 into matplotlib:master Mar 7, 2016
2 checks passed

2 checks passed

continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

tacaswell removed the needs_review label Mar 7, 2016

@tacaswell
Owner

tacaswell commented Mar 7, 2016

👍 Thanks

@tacaswell tacaswell added a commit that referenced this pull request Mar 7, 2016

@tacaswell tacaswell Merge pull request #6124 from estan/qt5-example-fixes 
Fix about dialog on Qt 5
 20db6a0
@tacaswell
Owner

tacaswell commented Mar 7, 2016

backported to v1.5.1-doc as 20db6a0

QuLogic added this to the 1.5.2 (Critical bug fix release) milestone Mar 7, 2016

@bearstrong bearstrong added a commit to bearstrong/matplotlib that referenced this pull request Apr 1, 2016

@tacaswell @bearstrong tacaswell + bearstrong Merge pull request #6124 from estan/qt5-example-fixes 
Fix about dialog on Qt 5
 fbb9110
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment