diff options
Diffstat (limited to 'src/imports/etcprovider')
| -rw-r--r-- | src/imports/etcprovider/qetcprovider.cpp | 5 | ||||
| -rw-r--r-- | src/imports/etcprovider/qetcprovider.h | 2 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/imports/etcprovider/qetcprovider.cpp b/src/imports/etcprovider/qetcprovider.cpp index 3e76c017a4..053258a794 100644 --- a/src/imports/etcprovider/qetcprovider.cpp +++ b/src/imports/etcprovider/qetcprovider.cpp @@ -44,7 +44,8 @@ #include <QtDebug> #include <QFile> -#include <qglfunctions.h> +#include <qopenglfunctions.h> +#include <qopenglcontext.h> QT_BEGIN_NAMESPACE @@ -118,7 +119,7 @@ void EtcTexture::bind() "paddedWidth: " << m_paddedSize.width() << "paddedHeight: " << m_paddedSize.height(); #endif - const QGLContext *ctx = QGLContext::currentContext(); + QOpenGLContext *ctx = QOpenGLContext::currentContext(); Q_ASSERT(ctx != 0); ctx->functions()->glCompressedTexImage2D(GL_TEXTURE_2D, 0, GL_ETC1_RGB8_OES, m_size.width(), m_size.height(), 0, diff --git a/src/imports/etcprovider/qetcprovider.h b/src/imports/etcprovider/qetcprovider.h index a34b458b70..46ec421162 100644 --- a/src/imports/etcprovider/qetcprovider.h +++ b/src/imports/etcprovider/qetcprovider.h @@ -42,7 +42,7 @@ #ifndef QETCPROVIDER_H #define QETCPROVIDER_H -#include <qgl.h> +#include <qopengl.h> #include <QDeclarativeImageProvider> #include <QSGTexture> #include <QDeclarativeEngine> |