]>
Commit | Line | Data |
---|---|---|
a4e8bbcc PS |
1 | --- trunk/libjava/classpath/configure.ac.orig 2006-07-02 15:32:04.000000000 +0200 |
2 | +++ trunk/libjava/classpath/configure.ac 2006-07-02 19:18:28.913906000 +0200 | |
3 | @@ -445,7 +445,8 @@ | |
4 | AC_CHECK_FILE([$EXTRA_QT_INCLUDE_DIR/QWidget], | |
5 | QT_CFLAGS="$QT_CFLAGS -I$EXTRA_QT_INCLUDE_DIR", | |
6 | AC_MSG_WARN([QWidget not found]))) | |
7 | - AC_CHECK_PROG(MOC, [moc], [moc]) | |
8 | + QT4DIR=`$PKG_CONFIG --variable=prefix QtGui` | |
9 | + AC_CHECK_PROG(MOC, [moc], [$QT4DIR/bin/moc], [], $QT4DIR/bin) | |
10 | fi | |
11 | if test "x$HAVE_QT4" = "xno"; then | |
12 | AC_MSG_NOTICE([Looking for QT_CFLAGS and QT_LIBS without pkg-config]) | |
13 | --- trunk/libjava/classpath/native/jni/qt-peer/Makefile.am.orig 2006-07-02 15:31:56.000000000 +0200 | |
14 | +++ trunk/libjava/classpath/native/jni/qt-peer/Makefile.am 2006-07-02 19:55:57.446430500 +0200 | |
15 | @@ -8,7 +8,10 @@ | |
16 | gcjversionedlib_LTLIBRARIES = libqtpeer.la | |
17 | ||
18 | AM_LDFLAGS = @CLASSPATH_MODULE@ @QT_LIBS@ | |
19 | -AM_CPPFLAGS = @CLASSPATH_INCLUDES@ | |
20 | +AM_CPPFLAGS = @CLASSPATH_INCLUDES@ \ | |
21 | + -I$(top_builddir)/../../libstdc++-v3/include \ | |
22 | + -I$(top_builddir)/../../libstdc++-v3/include/$(target_alias) \ | |
23 | + -I$(top_srcdir)/../../libstdc++-v3/libsupc++ | |
24 | ||
25 | AM_CXXFLAGS = @QT_CFLAGS@ | |
26 | ||
27 | --- trunk/libjava/classpath/native/jni/qt-peer/Makefile.in.orig 2006-07-02 15:31:56.000000000 +0200 | |
28 | +++ trunk/libjava/classpath/native/jni/qt-peer/Makefile.in 2006-07-02 19:56:14.711509500 +0200 | |
29 | @@ -324,7 +324,10 @@ | |
30 | gcjversionedlibdir = $(libdir)/gcj-$(gcc_version) | |
31 | gcjversionedlib_LTLIBRARIES = libqtpeer.la | |
32 | AM_LDFLAGS = @CLASSPATH_MODULE@ @QT_LIBS@ | |
33 | -AM_CPPFLAGS = @CLASSPATH_INCLUDES@ | |
34 | +AM_CPPFLAGS = @CLASSPATH_INCLUDES@ \ | |
35 | + -I$(top_builddir)/../../libstdc++-v3/include \ | |
36 | + -I$(top_builddir)/../../libstdc++-v3/include/$(target_alias) \ | |
37 | + -I$(top_srcdir)/../../libstdc++-v3/libsupc++ | |
38 | AM_CXXFLAGS = @QT_CFLAGS@ | |
39 | libqtpeer_la_MOC = \ | |
40 | slotcallbacks.moc.h | |
41 | --- trunk/libjava/classpath/native/jni/qt-peer/componentevent.cpp.orig 2005-11-16 00:20:01.000000000 +0100 | |
42 | +++ trunk/libjava/classpath/native/jni/qt-peer/componentevent.cpp 2006-02-26 17:59:49.285101500 +0100 | |
2593be09 PS |
43 | @@ -39,6 +39,7 @@ |
44 | #include <QWidget> | |
45 | #include <QPoint> | |
46 | ||
47 | +#include <assert.h> | |
48 | #include "componentevent.h" | |
49 | ||
50 | AWTInitEvent::AWTInitEvent(JNIEnv *env, jobject obj) : AWTEvent() | |
a4e8bbcc PS |
51 | --- trunk/libjava/classpath/gnu/java/awt/peer/qt/QtToolkit.java.orig 2006-07-02 15:31:57.000000000 +0200 |
52 | +++ trunk/libjava/classpath/gnu/java/awt/peer/qt/QtToolkit.java 2006-07-02 18:52:59.444756500 +0200 | |
53 | @@ -136,7 +136,7 @@ | |
54 | { | |
2593be09 PS |
55 | eventQueue = new EventQueue(); |
56 | repaintThread = new QtRepaintThread(); | |
a4e8bbcc PS |
57 | - System.loadLibrary("qtpeer"); |
58 | + System.loadLibrary("-gnu-java-awt-peer-qt"); | |
2593be09 PS |
59 | |
60 | String theme = null; | |
61 | try |