diff options
Diffstat (limited to 'src/threed/textures/qgltexture2d_p.h')
-rw-r--r-- | src/threed/textures/qgltexture2d_p.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/threed/textures/qgltexture2d_p.h b/src/threed/textures/qgltexture2d_p.h index 56104854d..38f18f0ed 100644 --- a/src/threed/textures/qgltexture2d_p.h +++ b/src/threed/textures/qgltexture2d_p.h @@ -57,7 +57,8 @@ #include "qgltextureutils_p.h" #include "qurl.h" -#include <QtCore/qatomic.h> +#include <QAtomicInt> +#include <QImage> QT_BEGIN_NAMESPACE @@ -65,7 +66,7 @@ class QGLTexture2DTextureInfo { public: QGLTexture2DTextureInfo - (const QGLContext *context, GLuint textureId, uint imageGeneration, + (QOpenGLContext *context, GLuint textureId, uint imageGeneration, uint parameterGeneration, bool isLiteral = false) { if (textureId) @@ -96,7 +97,7 @@ public: QImage image; QUrl url; QByteArray compressedData; - QGLContext::BindOptions bindOptions; + QGLTexture2D::BindOptions bindOptions; QGL::TextureWrap horizontalWrap; QGL::TextureWrap verticalWrap; #if !defined(QT_OPENGL_ES) |