diff options
Diffstat (limited to 'libjava/classpath/native/jni/qt-peer')
| -rw-r--r-- | libjava/classpath/native/jni/qt-peer/Makefile.in | 10 | ||||
| -rw-r--r-- | libjava/classpath/native/jni/qt-peer/mainqtthread.cpp | 8 | ||||
| -rw-r--r-- | libjava/classpath/native/jni/qt-peer/qtmenupeer.cpp | 1 |
3 files changed, 7 insertions, 12 deletions
diff --git a/libjava/classpath/native/jni/qt-peer/Makefile.in b/libjava/classpath/native/jni/qt-peer/Makefile.in index ab3b23007d4..e582bb6d27e 100644 --- a/libjava/classpath/native/jni/qt-peer/Makefile.in +++ b/libjava/classpath/native/jni/qt-peer/Makefile.in @@ -47,10 +47,11 @@ DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/../../libtool.m4 \ $(top_srcdir)/m4/acattribute.m4 $(top_srcdir)/m4/accross.m4 \ - $(top_srcdir)/m4/acinclude.m4 $(top_srcdir)/m4/iconv.m4 \ - $(top_srcdir)/m4/lib-ld.m4 $(top_srcdir)/m4/lib-link.m4 \ - $(top_srcdir)/m4/lib-prefix.m4 $(top_srcdir)/m4/pkg.m4 \ - $(top_srcdir)/configure.ac + $(top_srcdir)/m4/acinclude.m4 \ + $(top_srcdir)/m4/ax_create_stdint_h.m4 \ + $(top_srcdir)/m4/iconv.m4 $(top_srcdir)/m4/lib-ld.m4 \ + $(top_srcdir)/m4/lib-link.m4 $(top_srcdir)/m4/lib-prefix.m4 \ + $(top_srcdir)/m4/pkg.m4 $(top_srcdir)/configure.ac am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -186,6 +187,7 @@ JAY = @JAY@ JAY_SKELETON = @JAY_SKELETON@ JIKES = @JIKES@ JIKESENCODING = @JIKESENCODING@ +JIKESWARNINGS = @JIKESWARNINGS@ KJC = @KJC@ LDFLAGS = @LDFLAGS@ LIBDEBUG = @LIBDEBUG@ diff --git a/libjava/classpath/native/jni/qt-peer/mainqtthread.cpp b/libjava/classpath/native/jni/qt-peer/mainqtthread.cpp index 7922dbcf10b..19566c63b2d 100644 --- a/libjava/classpath/native/jni/qt-peer/mainqtthread.cpp +++ b/libjava/classpath/native/jni/qt-peer/mainqtthread.cpp @@ -45,9 +45,6 @@ exception statement from your version. */ MainThreadInterface *mainThread; QApplication *qApplication; -#if defined(Q_WS_X11) -extern void qt_x11_set_global_double_buffer( bool ); -#endif /** * Starts up a QApplication @@ -92,11 +89,6 @@ JNIEXPORT jlong JNICALL Java_gnu_java_awt_peer_qt_MainQtThread_init jfieldID nofid = env->GetFieldID( cls, "mainThreadInterface", "J" ); env->SetLongField( obj, nofid, (jlong)mainThread ); -#if defined(Q_WS_X11) - // turn off double-buffering. - qt_x11_set_global_double_buffer( (doublebuffer == JNI_TRUE) ); -#endif - return (jlong)qtApp; } diff --git a/libjava/classpath/native/jni/qt-peer/qtmenupeer.cpp b/libjava/classpath/native/jni/qt-peer/qtmenupeer.cpp index bf081e98455..1ac17145c2f 100644 --- a/libjava/classpath/native/jni/qt-peer/qtmenupeer.cpp +++ b/libjava/classpath/native/jni/qt-peer/qtmenupeer.cpp @@ -125,6 +125,7 @@ public: jclass menuCls = env->GetObjectClass( menuPeer ); jmethodID mid = env->GetMethodID(menuCls, "add", "(J)V"); + env->DeleteLocalRef(menuCls); env->CallVoidMethod( menuPeer, mid, (jlong)newAction ); env->DeleteGlobalRef( menuPeer ); |
