diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-01-23 12:01:14 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-01-24 09:17:07 +0000 |
| commit | a9b6c561b0f97ab691b92b791213b22f8cb35b4a (patch) | |
| tree | 7f11283105a84c91f834deba81d9e0e38265661f /src | |
| parent | 46a14a39dc74d8e5b4efe1b5ceeb0c09d6436885 (diff) | |
Fix build after qtdeclarative change - 9e3c46961a
We depended on another header including qopenglcontext_p.h
Fixes: QTBUG-73224
Change-Id: Ifbd7e17cd62b08466ebbe4d2091c92e4091fc8a3
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/delegated_frame_node.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/core/delegated_frame_node.cpp b/src/core/delegated_frame_node.cpp index 3755759a1..8ac82dbf1 100644 --- a/src/core/delegated_frame_node.cpp +++ b/src/core/delegated_frame_node.cpp @@ -121,6 +121,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 { @@ -1275,7 +1281,7 @@ void DelegatedFrameNode::fetchAndSyncMailboxes(QList<MailboxTexture *> &mailboxe deleteChromiumSync(&sync); } -#if defined(USE_OZONE) +#if defined(USE_OZONE) && !defined(QT_NO_OPENGL) // Workaround when context is not shared QTBUG-48969 // Make slow copy between two contexts. if (!m_contextShared) { |