--- qt-x11-free-3.3.3/src/tools/qlibrary.cpp.fix-load-gl 2004-08-05 16:41:55.000000000 +0200 +++ qt-x11-free-3.3.3/src/tools/qlibrary.cpp 2004-09-08 11:08:00.181232215 +0200 @@ -39,6 +39,7 @@ #include "qplatformdefs.h" #include <private/qlibrary_p.h> #include <qstringlist.h> +#include <qregexp.h> #include <qfile.h> #ifndef QT_NO_LIBRARY @@ -393,6 +394,8 @@ QString QLibrary::library() const return libfile; QString filename = libfile; + if (QFile::exists(filename)) + return filename; #if defined(Q_WS_WIN) if ( filename.findRev( '.' ) <= filename.findRev( '/' ) ) @@ -422,9 +425,10 @@ QString QLibrary::library() const QString path = tmpfilename.left( x + 1 ); QString file = tmpfilename.right( tmpfilename.length() - x - 1 ); tmpfilename = QString( "%1lib%2" ).arg( path ).arg( file ); - } else { + } else if (tmpfilename.left(3) != QString("lib")) { tmpfilename = QString( "lib%1" ).arg( filename ); } + if (!tmpfilename.contains(QRegExp(filter + "((\\.[0-9]+)+)?$"))) tmpfilename += filter; if(QFile::exists(tmpfilename) || it == filters.end()) { filename = tmpfilename; --- qt-x11-free-3.3.3/src/opengl/qgl_x11.cpp.fix-load-gl 2004-09-08 10:02:30.145604000 +0200 +++ qt-x11-free-3.3.3/src/opengl/qgl_x11.cpp 2004-09-08 10:35:28.938632595 +0200 @@ -125,7 +125,7 @@ bool qt_resolve_gl_symbols(bool fatal) if (gl_syms_resolved) return TRUE; - QLibrary gl("GL"); + QLibrary gl("libGL.so.1"); gl.setAutoUnload(FALSE); qt_glCallLists = (_glCallLists) gl.resolve("glCallLists");