diff options
| author | Svenn-Arne Dragly <s@dragly.com> | 2016-02-25 15:36:22 +0100 |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@qt.io> | 2016-05-02 21:35:56 +0000 |
| commit | f4f5219f0017d36e1b14fc4b88e9006b59c75b3f (patch) | |
| tree | 2857566989115502c2be5846b6adfffb76825ee7 /src/gui/opengl/qopenglfunctions.h | |
| parent | 375adf412f44466a9ef588529ebbf7f102878919 (diff) | |
Update support for Emscripten
Change-Id: I5d696f0dbc188acb4faad83240f7b1aa7177dc48
Reviewed-by: Svenn-Arne Dragly <s@dragly.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@qt.io>
Diffstat (limited to 'src/gui/opengl/qopenglfunctions.h')
| -rw-r--r-- | src/gui/opengl/qopenglfunctions.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/opengl/qopenglfunctions.h b/src/gui/opengl/qopenglfunctions.h index ca002642d8..6699b38b39 100644 --- a/src/gui/opengl/qopenglfunctions.h +++ b/src/gui/opengl/qopenglfunctions.h @@ -565,7 +565,7 @@ struct QOpenGLFunctionsPrivate // GLES2 + OpenGL1 common subset -#ifdef Q_OS_NACL +#if defined(Q_OS_NACL) && !defined(Q_OS_NACL_EMSCRIPTEN) #include "qopenglfunctions_nacl.h" #else inline void QOpenGLFunctions::glBindTexture(GLenum target, GLuint texture) |