diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-01-24 14:14:45 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-01-24 14:15:38 +0100 |
| commit | af0b242fc5d3f78c3c176bd94c9cdf57252a9dcd (patch) | |
| tree | 206194c656cfc8195bda39017abe7580433a84b4 /src/core/compositor | |
| parent | be0fb77baf98f773928b4ff9d08a13c83f189564 (diff) | |
| parent | a9b6c561b0f97ab691b92b791213b22f8cb35b4a (diff) | |
Merge remote-tracking branch 'origin/5.12' into dev
Change-Id: I040db21f90766827c84c48dc0ed2d2d623dc011a
Diffstat (limited to 'src/core/compositor')
| -rw-r--r-- | src/core/compositor/delegated_frame_node.cpp | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/core/compositor/delegated_frame_node.cpp b/src/core/compositor/delegated_frame_node.cpp index 571d02773..49e3577de 100644 --- a/src/core/compositor/delegated_frame_node.cpp +++ b/src/core/compositor/delegated_frame_node.cpp @@ -108,6 +108,12 @@ #define GL_LINE_LOOP 0x0002 #endif +#ifndef QT_NO_OPENGL +QT_BEGIN_NAMESPACE +Q_GUI_EXPORT QOpenGLContext *qt_gl_global_share_context(); +QT_END_NAMESPACE +#endif + namespace QtWebEngineCore { #ifndef QT_NO_OPENGL class MailboxTexture : public QSGTexture, protected QOpenGLFunctions { |