diff options
| author | Tom Cooksey <thomas.cooksey@nokia.com> | 2010-04-30 11:55:06 (GMT) |
|---|---|---|
| committer | Tom Cooksey <thomas.cooksey@nokia.com> | 2010-04-30 11:58:09 (GMT) |
| commit | d279e5d3ee808f4faeb5408dc66740b7fffab84f (patch) | |
| tree | dfe0e5e4be35e7c973042dee6cbd5e79c90df9e0 | |
| parent | 468af8f1dd1c9bc98919e8f407c9676e880249f9 (diff) | |
| download | Qt-d279e5d3ee808f4faeb5408dc66740b7fffab84f.zip Qt-d279e5d3ee808f4faeb5408dc66740b7fffab84f.tar.gz Qt-d279e5d3ee808f4faeb5408dc66740b7fffab84f.tar.bz2 | |
Fix GL extention function pointer lookups in testlite
For some reason, if the application doesn't link against QtOpenGL
then the qt_gl_library_name() symbol will be missing. For now just
hard-code the library name to "GL".
| -rw-r--r-- | src/plugins/platforms/testlite/qglxintegration.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/plugins/platforms/testlite/qglxintegration.cpp b/src/plugins/platforms/testlite/qglxintegration.cpp index c21c3aa..d4383ef 100644 --- a/src/plugins/platforms/testlite/qglxintegration.cpp +++ b/src/plugins/platforms/testlite/qglxintegration.cpp @@ -296,7 +296,8 @@ void* QGLXGLContext::getProcAddress(const QString& procName) #endif { extern const QString qt_gl_library_name(); - QLibrary lib(qt_gl_library_name()); +// QLibrary lib(qt_gl_library_name()); + QLibrary lib(QLatin1String("GL")); glXGetProcAddressARB = (qt_glXGetProcAddressARB) lib.resolve("glXGetProcAddressARB"); } } |