diff options
| author | Harald Fernengel <harald.fernengel@nokia.com> | 2009-09-23 10:50:12 (GMT) |
|---|---|---|
| committer | Harald Fernengel <harald.fernengel@nokia.com> | 2009-09-23 10:53:02 (GMT) |
| commit | d1d65ed17d0f21e979a98ab695aa9e50c6ee078c (patch) | |
| tree | aaaf21fcd25591736c683850be74685b45ba5aed | |
| parent | 77ac469063064a85cfec79fdc8d45cee0fa8e426 (diff) | |
| download | Qt-d1d65ed17d0f21e979a98ab695aa9e50c6ee078c.zip Qt-d1d65ed17d0f21e979a98ab695aa9e50c6ee078c.tar.gz Qt-d1d65ed17d0f21e979a98ab695aa9e50c6ee078c.tar.bz2 | |
Make gtkstyle work on non-developer machines again
While refactoring gtkstyle in 4.6, the "0" .so suffix was dropped.
This patch restores the 4.5 behavior to look for *.so.0 since the *.so
is only available if you install the gtk developer packages.
Reviewed-by: jbache
| -rw-r--r-- | src/gui/styles/gtksymbols.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/gui/styles/gtksymbols.cpp b/src/gui/styles/gtksymbols.cpp index 23d25bd..1cb0ca4 100644 --- a/src/gui/styles/gtksymbols.cpp +++ b/src/gui/styles/gtksymbols.cpp @@ -211,7 +211,8 @@ static QString classPath(GtkWidget *widget) static void resolveGtk() { - QLibrary libgtk(QLS("gtk-x11-2.0")); + // enforce the "0" suffix, so we'll open libgtk-x11-2.0.so.0 + QLibrary libgtk(QLS("gtk-x11-2.0"), 0, 0); QGtk::gtk_init = (Ptr_gtk_init)libgtk.resolve("gtk_init"); QGtk::gtk_window_new = (Ptr_gtk_window_new)libgtk.resolve("gtk_window_new"); QGtk::gtk_style_attach = (Ptr_gtk_style_attach)libgtk.resolve("gtk_style_attach"); |