diff options
| author | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-09-10 14:13:20 +0200 |
|---|---|---|
| committer | Jocelyn Turcotte <jocelyn.turcotte@digia.com> | 2014-09-11 15:35:53 +0200 |
| commit | 50f79d4bfbfd1007fa3c75132dfc945ad39ac716 (patch) | |
| tree | 0f087fa489e4955b7711549ca6820370c28fe602 /src/core/gl_context_qt.cpp | |
| parent | d741059422ebeb1613c767bdd318c87228ec2160 (diff) | |
Remove unnecessary private header includes
Most importantly, get rid of QOpenGLContextPrivate::globalShareContext
which will be removed before the final.
Change-Id: I5796fa822d2962c21fd8b6d8d3c196686d536e3d
Reviewed-by: Andras Becsi <andras.becsi@digia.com>
Diffstat (limited to 'src/core/gl_context_qt.cpp')
| -rw-r--r-- | src/core/gl_context_qt.cpp | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/core/gl_context_qt.cpp b/src/core/gl_context_qt.cpp index 4c196d969..6aec2d3b3 100644 --- a/src/core/gl_context_qt.cpp +++ b/src/core/gl_context_qt.cpp @@ -37,12 +37,10 @@ #include "gl_context_qt.h" #include <QGuiApplication> +#include <QOpenGLContext> #include <QThread> -#include "ui/gl/gl_context_egl.h" - -#include <private/qopenglcontext_p.h> -#include <private/qsgcontext_p.h> #include <qpa/qplatformnativeinterface.h> +#include "ui/gl/gl_context_egl.h" #if defined(USE_X11) #include <X11/Xlib.h> @@ -50,13 +48,14 @@ QT_BEGIN_NAMESPACE +Q_GUI_EXPORT QOpenGLContext *qt_gl_global_share_context(); GLContextHelper* GLContextHelper::contextHelper = 0; namespace { inline void *resourceForContext(const QByteArray &resource) { - return qApp->platformNativeInterface()->nativeResourceForContext(resource, QOpenGLContextPrivate::globalShareContext()); + return qApp->platformNativeInterface()->nativeResourceForContext(resource, qt_gl_global_share_context()); } inline void *resourceForIntegration(const QByteArray &resource) |