Skip to content

%gui qt5 - #6496

Merged
takluyver merged 1 commit into
ipython:masterfrom
userzimmermann:master
Sep 19, 2014
Merged

takluyver merged 1 commit into
ipython:masterfrom
userzimmermann:master

Conversation

@userzimmermann

Copy link
Copy Markdown
Contributor

I just wanted a simple way to explicitly decide between a Qt5 and a Qt4 loop, so I added these few lines :)

@takluyver

Copy link
Copy Markdown
Member

Sorry, this will conflict with #5666. Can I ask you to redo it on top of that once it's merged? I think that's easier than rebasing that PR again.

@userzimmermann

Copy link
Copy Markdown
Contributor Author

I will make it so...

@takluyver

Copy link
Copy Markdown
Member

Thanks :-)

@userzimmermann

Copy link
Copy Markdown
Contributor Author

Made

@takluyver

Copy link
Copy Markdown
Member

Thanks, this is satisfyingly neat. There's a small problem that the app object will get registered under the name 'qt4', but that's because of something I missed in updating this API, so I'll merge this and fix that in a separate PR.

takluyver added a commit that referenced this pull request Sep 19, 2014
@takluyver
takluyver merged commit b5a06df into ipython:master Sep 19, 2014
takluyver added a commit to takluyver/ipython that referenced this pull request Sep 19, 2014
This avoids a problem I noticed in ipythongh-6496, where a subclassed handler
would have its application registered by the parent class under the
wrong name.
@takluyver

Copy link
Copy Markdown
Member

If you're interested in what I changed, see #6505.

@userzimmermann

Copy link
Copy Markdown
Contributor Author

Yes I am. Thanks :)

minrk added a commit to minrk/ipython that referenced this pull request Oct 1, 2014
same as terminal IPython in ipython#6496
didn't need anything beyond register
minrk added a commit to minrk/ipython that referenced this pull request Oct 1, 2014
same as terminal IPython in ipython#6496
didn't need anything beyond register
@minrk minrk modified the milestone: 3.0 Oct 3, 2014
mattvonrocketstein pushed a commit to mattvonrocketstein/ipython that referenced this pull request Nov 3, 2014
mattvonrocketstein pushed a commit to mattvonrocketstein/ipython that referenced this pull request Nov 3, 2014
This avoids a problem I noticed in ipythongh-6496, where a subclassed handler
would have its application registered by the parent class under the
wrong name.
mattvonrocketstein pushed a commit to mattvonrocketstein/ipython that referenced this pull request Nov 3, 2014
same as terminal IPython in ipython#6496
didn't need anything beyond register
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.

4 participants