From ade710a51ffc2b4657fb33e94de5025ef513fe05 Mon Sep 17 00:00:00 2001 From: Thomas Fitzsimmons Date: Wed, 7 Jun 2006 21:46:24 +0000 Subject: makemake.tcl (emit_bc_rule): Do not skip gnu-java-awt-peer-qt.lo. 2006-06-07 Thomas Fitzsimmons * scripts/makemake.tcl (emit_bc_rule): Do not skip gnu-java-awt-peer-qt.lo. * configure.ac (QT_AWT): Remove conditional. Do not add gnu/java/awt/peer/qt to standard.omit. * classpath/native/jni/qt-peer/Makefile.am: Install libqtpeer.so in GCJ's versioned library directory. * classpath/gnu/java/awt/peer/qt/QtToolkit.java (initToolkit): Load libqtpeer.so unconditionally. * gij.cc (main): Do not re-exec gij. * Makefile.am: Remove lib-gnu-java-awt-peer-qt.lo build logic. (gij_LDFLAGS): Point -rpath at GCJ's versioned library directory when linking gij. From-SVN: r114473 --- libjava/classpath/gnu/java/awt/peer/qt/QtToolkit.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'libjava/classpath/gnu/java') diff --git a/libjava/classpath/gnu/java/awt/peer/qt/QtToolkit.java b/libjava/classpath/gnu/java/awt/peer/qt/QtToolkit.java index 591b528035d..73652f8df90 100644 --- a/libjava/classpath/gnu/java/awt/peer/qt/QtToolkit.java +++ b/libjava/classpath/gnu/java/awt/peer/qt/QtToolkit.java @@ -136,8 +136,7 @@ public class QtToolkit extends ClasspathToolkit { eventQueue = new EventQueue(); repaintThread = new QtRepaintThread(); - if (Configuration.INIT_LOAD_LIBRARY) - System.loadLibrary("qtpeer"); + System.loadLibrary("qtpeer"); String theme = null; try -- cgit v1.2.1