Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

PR: Add support for PyQt 4.6 #106

Merged
merged 1 commit into from
May 5, 2017
Merged

Conversation

davvid
Copy link
Contributor

@davvid davvid commented May 4, 2017

PyQt4 4.6 on Centos 6.8 reports itself as:

    PyQt4.x86_64 4.6.2-9.el6 @base
    PyQt4-devel.x86_64 4.6.2-9.el6 @base

This version is missing symbols from QtGui that causes qtpy to
fail. Allow import qtpy to work in this environment.

Signed-off-by: David Aguilar davvid@gmail.com

@davvid
Copy link
Contributor Author

davvid commented May 4, 2017

@eephillip originally reported this in git-cola/git-cola#692

del QMatrix3x4, QMatrix4x2, QMatrix4x3, QMatrix4x4
del QQuaternion, QRadialGradient, QRawFont, QRegExpValidator
del QStaticText, QTouchEvent, QVector2D, QVector3D, QVector4D
del qFuzzyCompare
Copy link
Member

Choose a reason for hiding this comment

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

Please use a single del to remove all these symbols (as it's done below).

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Good catch, I'll repush this branch shortly with that fixup.

@ccordoba12 ccordoba12 changed the title qtpy: add support for PyQt 4.6 Add support for PyQt 4.6 May 4, 2017
@ccordoba12 ccordoba12 added this to the v1.3 milestone May 4, 2017
@ccordoba12
Copy link
Member

I'm +1 for this change. I just left a minor comment, then I'll merge.

@davvid davvid force-pushed the pyqt46 branch 2 times, most recently from 7c09798 to 731d0bc Compare May 5, 2017 06:42
PyQt4 4.6 on Centos 6.8 reports itself as:

        PyQt4.x86_64 4.6.2-9.el6 @base
        PyQt4-devel.x86_64 4.6.2-9.el6 @base

This version is missing symbols from QtGui that causes qtpy to
fail.  Allow `import qtpy` to work in this environment.

Signed-off-by: David Aguilar <davvid@gmail.com>
@ccordoba12 ccordoba12 changed the title Add support for PyQt 4.6 PR: Add support for PyQt 4.6 May 5, 2017
@ccordoba12 ccordoba12 merged commit 915dcc7 into spyder-ide:master May 5, 2017
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