diff options
| author | Tom Cooksey <thomas.cooksey@nokia.com> | 2010-04-30 07:44:02 (GMT) |
|---|---|---|
| committer | Tom Cooksey <thomas.cooksey@nokia.com> | 2010-04-30 07:55:27 (GMT) |
| commit | 777fd03ca38f3ced43d2e2da45ddfa1f9a4d2456 (patch) | |
| tree | bdc00c90779f2a9ae6cafca00592a1ac849a7d54 /src | |
| parent | 070ac81db30d25f129a2ec94c227ab74ce00b8d3 (diff) | |
| download | Qt-777fd03ca38f3ced43d2e2da45ddfa1f9a4d2456.zip Qt-777fd03ca38f3ced43d2e2da45ddfa1f9a4d2456.tar.gz Qt-777fd03ca38f3ced43d2e2da45ddfa1f9a4d2456.tar.bz2 | |
Return the correct library name in qt_gl_library_name for GLES*
Reviewed-By: Gunnar
Diffstat (limited to 'src')
| -rw-r--r-- | src/opengl/qgl.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/opengl/qgl.cpp b/src/opengl/qgl.cpp index 52efea5..3e4032a 100644 --- a/src/opengl/qgl.cpp +++ b/src/opengl/qgl.cpp @@ -5161,11 +5161,17 @@ Q_OPENGL_EXPORT void qt_set_gl_library_name(const QString& name) Q_OPENGL_EXPORT const QString qt_gl_library_name() { if (qt_gl_lib_name()->isNull()) { -#if defined(Q_WS_X11) || defined(Q_WS_QWS) - return QLatin1String("GL"); -#else // Q_WS_MAC +#ifdef Q_WS_MAC return QLatin1String("/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib"); -#endif +#else +# if defined(QT_OPENGL_ES_1) + return QLatin1String("GLES_CM"); +# elif defined(QT_OPENGL_ES_2) + return QLatin1String("GLESv2"); +# else + return QLatin1String("GL"); +# endif +#endif // defined Q_WS_MAC } return *qt_gl_lib_name(); } |