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

Fix running from an installed version (Fix #618, Fix BlueBrain/Livre#379) #619

Merged
merged 4 commits into from
Feb 20, 2017

Conversation

eile
Copy link
Member

@eile eile commented Feb 17, 2017

No description provided.

@eile
Copy link
Member Author

eile commented Feb 17, 2017

Hold this horse - need to verify that plugins are loaded.

@eile
Copy link
Member Author

eile commented Feb 17, 2017

Please shoot the horse now.

@eile eile merged commit 71f48aa into Eyescale:master Feb 20, 2017
@ErwannHouzay
Copy link

Great! It works... Thanks.

Just one detail. I need to integrate Livre in a QT app. I compiled Equalizer with QT support.

I'm using distributed QT 5 devel packages.

To make it compile I need to change a litlle bit QuickRenderer.cpp in Deflect

line 50:

#ifdef DEFLECT_USE_QT5GUI

#include
QT_BEGIN_NAMESPACE
Q_GUI_EXPORT QOpenGLContext *qt_gl_global_share_context();
QT_END_NAMESPACE

#endif

and replace calls

#if DEFLECT_USE_QT5GUI
qt_gl_global_share_context( );
#else
qWarning() << "DeflectQt was not compiled with WebEngineView support";
#endif
}

@eile
Copy link
Member Author

eile commented Feb 20, 2017

Can you please submit a pull request in Deflect with this change?

@eile
Copy link
Member Author

eile commented Feb 20, 2017

@rdumusc FYI

@rdumusc
Copy link

rdumusc commented Feb 20, 2017

Yes, I'm already looking into this. The compilation error must be because the private headers are not installed and CMake did not catch it for some reason, despite the check that sets DEFLECT_USE_QT5GUI.

This suggestion to forward-declare the function instead of including the private header looks reasonable as I discovered that it is how it is done internally in QtWebengine:
https://git.merproject.org/mer-core/qtbase/commit/219c2eb4e28dd1c806cbc2115ff40454d6d3f9c5
http://code.qt.io/cgit/qt/qtwebengine.git/commit/?id=f77967d96d161c791b0f49e73b243019b5ab484a

Note that the above code should use qt_gl_set_global_share_context(QOpenGLContext* context) (setter) and not QOpenGLContext *qt_gl_global_share_context() (getter).

I will submit a patch later today.

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.

5 participants