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

Move QStringListModel to QtCore #74

Merged
merged 2 commits into from
Jan 2, 2017
Merged

Move QStringListModel to QtCore #74

merged 2 commits into from
Jan 2, 2017

Conversation

almarklein
Copy link
Contributor

Supersedes #72

@almarklein
Copy link
Contributor Author

Is the failing CI a glitch?

@ccordoba12
Copy link
Member

I think there are some conflicts between the latest Qt Continuum build on Mac and PySide (which is a very old package).

I'll take a look at this next week :-)

@almarklein
Copy link
Contributor Author

👍 I am not in a hurry. I am vendoring qtpy (at least for now).

@ccordoba12 ccordoba12 added this to the v1.2 milestone Jan 2, 2017
@ccordoba12 ccordoba12 changed the title QStringListModel -> QtCore Move QStringListModel to QtCore Jan 2, 2017
@ccordoba12
Copy link
Member

Thanks @almarklein and sorry for the big delay on this one. If you need any more things for Pyzo, please submit your PRs this week because I'm about to release qtpy 1.2 :-)

@ccordoba12 ccordoba12 merged commit 8ffabfd into spyder-ide:master Jan 2, 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