You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
45 lines
1.9 KiB
45 lines
1.9 KiB
--- src/opengl/qgl_x11.cpp
|
|
+++ src/opengl/qgl_x11.cpp 2004/04/13 14:56:00
|
|
@@ -267,7 +267,7 @@
|
|
typedef Status (*_XmuLookupStandardColormap)( Display *dpy, int screen, VisualID visualid, unsigned int depth,
|
|
Atom property, Bool replace, Bool retain );
|
|
_XmuLookupStandardColormap qt_XmuLookupStandardColormap;
|
|
- qt_XmuLookupStandardColormap = (_XmuLookupStandardColormap) QLibrary::resolve("Xmu", "XmuLookupStandardColormap");
|
|
+ qt_XmuLookupStandardColormap = (_XmuLookupStandardColormap) QLibrary::resolve("Xmu.so.6", "XmuLookupStandardColormap");
|
|
if (!qt_XmuLookupStandardColormap)
|
|
qFatal("Unable to resolve Xmu symbols - please check your Xmu library installation.");
|
|
#define XmuLookupStandardColormap qt_XmuLookupStandardColormap
|
|
Index: src/tools/qlibrary.cpp
|
|
===================================================================
|
|
RCS file: /home/kde/qt-copy/src/tools/qlibrary.cpp,v
|
|
retrieving revision 1.26
|
|
diff -u -3 -p -r1.26 qlibrary.cpp
|
|
--- src/tools/qlibrary.cpp 4 Feb 2004 14:25:02 -0000 1.26
|
|
+++ src/tools/qlibrary.cpp 2 Jun 2004 08:26:21 -0000
|
|
@@ -424,7 +424,8 @@ QString QLibrary::library() const
|
|
} else {
|
|
tmpfilename = QString( "lib%1" ).arg( filename );
|
|
}
|
|
- tmpfilename += filter;
|
|
+ if ( !filename.contains(".so") )
|
|
+ tmpfilename += filter;
|
|
if(QFile::exists(tmpfilename) || it == filters.end()) {
|
|
filename = tmpfilename;
|
|
break;
|
|
Index: src/opengl/qgl_x11.cpp
|
|
===================================================================
|
|
RCS file: /home/kde/qt-copy/src/opengl/qgl_x11.cpp,v
|
|
retrieving revision 1.34
|
|
diff -u -3 -p -r1.34 qgl_x11.cpp
|
|
--- src/opengl/qgl_x11.cpp 21 Dec 2003 00:48:09 -0000 1.34
|
|
+++ src/opengl/qgl_x11.cpp 2 Jun 2004 08:26:21 -0000
|
|
@@ -116,7 +116,7 @@ bool qt_resolve_gl_symbols(bool fatal)
|
|
if (gl_syms_resolved)
|
|
return TRUE;
|
|
|
|
- QLibrary gl("GL");
|
|
+ QLibrary gl("GL.so.1");
|
|
gl.setAutoUnload(FALSE);
|
|
|
|
qt_glCallLists = (_glCallLists) gl.resolve("glCallLists");
|