diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-11 22:30:28 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-11 22:30:28 +1000 |
| commit | 3f8923d3a5d90220f376ac5946e32df2629f87f9 (patch) | |
| tree | 92f7d3ae1b66d587e38d42908ea4d633460f7856 | |
| parent | 8cd8e5e4cb9b8222bf6afdb980424bb571e0f977 (diff) | |
| parent | 587f7f753a97ecf5b9c5b2ee7e562699331010bc (diff) | |
Merge branch 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging
* 'master' of git://scm.dev.nokia.troll.no/qt/qtbase-staging:
Fix to commit 7fce0a73cc9b099c4ca67b3bc2e8bbe3060230c6.
| -rw-r--r-- | src/opengl/qglfunctions.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/opengl/qglfunctions.cpp b/src/opengl/qglfunctions.cpp index e478fa7a4c..173dd6838e 100644 --- a/src/opengl/qglfunctions.cpp +++ b/src/opengl/qglfunctions.cpp @@ -223,6 +223,7 @@ static int qt_gl_resolve_features() QGLFunctions::CompressedTextures | QGLFunctions::Multisample | QGLFunctions::StencilSeparate; + QGLExtensionMatcher extensions; if (extensions.match("GL_OES_texture_npot")) features |= QGLFunctions::NPOTTextures; if (extensions.match("GL_IMG_texture_npot")) |