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

Solve current incompatibility between WITH_QGLVIEWER and WITH_QT5 #1100

Merged
merged 1 commit into from
Jan 6, 2016

Conversation

phcerdan
Copy link
Member

@phcerdan phcerdan commented Jan 5, 2016

QGLViewer can be based on qt5 (libQGLViewer-qt5).
QtGui/qapplication.h header in qt4 has moved to QtWidgets in qt5.
Solved that with preprocessor directives based on WITH_QT5 in some viewer examples.

@kerautret
Copy link
Member

thanks @phcerdan for this PR. :) In fact from the edit of @naubry c548016 , this inclusion is already included in the DGtal/io/viewers/Viewer3D.h.
But you are right it was forgotten, so you just need to remove " the #include <QtGui/qapplication.h>" from the original code ...

#include <QtGui/qapplication.h>
#endif
#include "DGtal/io/viewers/Viewer3D.h"
Copy link
Member

Choose a reason for hiding this comment

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

here as commented you can remove line " #include <QtGui/qapplication.h>" and the ifdef

@phcerdan
Copy link
Member Author

phcerdan commented Jan 6, 2016

Oh nice. Done

@dcoeurjo
Copy link
Member

dcoeurjo commented Jan 6, 2016

Thanks a lot @phcerdan for your 1st DGtal pull-request ;) (and @kerautret of course).

@phcerdan could you please add a changelog entry (bug fixes, IO package) before I merge ?

@naubry
Copy link

naubry commented Jan 6, 2016

Thanks for this report. Indeed, I forgot these includes in my previous PR.

@phcerdan
Copy link
Member Author

phcerdan commented Jan 6, 2016

Thanks @dcoeurjo, quite happy to contribute a little! Changed log and squashed the 3 commits into one.

@dcoeurjo
Copy link
Member

dcoeurjo commented Jan 6, 2016

Great. Congrats @phcerdan for your first PR.

dcoeurjo added a commit that referenced this pull request Jan 6, 2016
Solve current incompatibility between WITH_QGLVIEWER and WITH_QT5
@dcoeurjo dcoeurjo merged commit 8fef303 into DGtal-team:master Jan 6, 2016
@phcerdan phcerdan deleted the QGLViewer-qt5 branch January 12, 2016 21:32
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