1 --- gcc/libjava/classpath/native/jni/qt-peer/componentevent.cpp.ark 2005-11-02 22:57:59.000000000 +0100
2 +++ gcc/libjava/classpath/native/jni/qt-peer/componentevent.cpp 2005-11-02 22:58:07.000000000 +0100
9 #include "componentevent.h"
11 AWTInitEvent::AWTInitEvent(JNIEnv *env, jobject obj) : AWTEvent()
12 --- gcc/libjava/classpath/configure.ac.ark 2005-11-02 23:02:44.000000000 +0100
13 +++ gcc/libjava/classpath/configure.ac 2005-11-02 23:06:39.000000000 +0100
15 AC_CHECK_FILE([$EXTRA_QT_INCLUDE_DIR/QWidget],
16 QT_CFLAGS="$QT_CFLAGS -I$EXTRA_QT_INCLUDE_DIR",
17 AC_MSG_WARN([QWidget not found])))
18 + QT_CFLAGS="$QT_CFLAGS -I\$(top_srcdir)/../../build/\$(shell cat \$(top_srcdir)/../../build/Makefile |grep ^TARGET_SUBDIR |awk '{ print \$\$3; }')/libstdc++-v3/include -I\$(top_srcdir)/../../build/\$(shell cat \$(top_srcdir)/../../build/Makefile |grep ^TARGET_SUBDIR |awk '{ print \$\$3; }')/libstdc++-v3/include/\$(shell cat \$(top_srcdir)/../../build/Makefile |grep ^TARGET_SUBDIR |awk '{ print \$\$3; }') -I\$(top_srcdir)/../../libstdc++-v3/libsupc++"
19 AC_MSG_NOTICE([Set QT_CFLAGS... $QT_CFLAGS])
20 AC_CHECK_PROG(MOC, [moc], [moc])
22 --- gcc/libjava/classpath/configure.ark 2005-11-02 23:03:14.000000000 +0100
23 +++ gcc/libjava/classpath/configure 2005-11-02 23:05:47.000000000 +0100
24 @@ -10661,7 +10661,7 @@
29 +QT_CFLAGS="$QT_CFLAGS -I\$(top_srcdir)/../../build/\$(shell cat \$(top_srcdir)/../../build/Makefile |grep ^TARGET_SUBDIR |awk '{ print \$\$3; }')/libstdc++-v3/include -I\$(top_srcdir)/../../build/\$(shell cat \$(top_srcdir)/../../build/Makefile |grep ^TARGET_SUBDIR |awk '{ print \$\$3; }')/libstdc++-v3/include/\$(shell cat \$(top_srcdir)/../../build/Makefile |grep ^TARGET_SUBDIR |awk '{ print \$\$3; }') -I\$(top_srcdir)/../../libstdc++-v3/libsupc++"
30 { echo "$as_me:$LINENO: Set QT_CFLAGS... $QT_CFLAGS" >&5
31 echo "$as_me: Set QT_CFLAGS... $QT_CFLAGS" >&6;}
32 # Extract the first word of "moc", so it can be a program name with args.
33 --- gcc/libjava/classpath/gnu/java/awt/peer/qt/QtToolkit.java.ark 2005-11-03 09:57:52.000000000 +0100
34 +++ gcc/libjava/classpath/gnu/java/awt/peer/qt/QtToolkit.java 2005-11-03 09:58:05.000000000 +0100
37 eventQueue = new EventQueue();
38 repaintThread = new QtRepaintThread();
39 - System.loadLibrary("qtpeer");
40 + System.loadLibrary("-gnu-java-awt-peer-qt");