]>
Commit | Line | Data |
---|---|---|
66a22188 PS |
1 | --- gcc-4.1.0-20060223/libjava/classpath/native/jni/qt-peer/componentevent.cpp.orig 2005-11-16 00:20:01.000000000 +0100 |
2 | +++ gcc-4.1.0-20060223/libjava/classpath/native/jni/qt-peer/componentevent.cpp 2006-02-26 17:59:49.285101500 +0100 | |
3 | @@ -39,6 +39,7 @@ | |
4 | #include <QWidget> | |
5 | #include <QPoint> | |
6 | ||
7 | +#include <assert.h> | |
8 | #include "componentevent.h" | |
9 | ||
10 | AWTInitEvent::AWTInitEvent(JNIEnv *env, jobject obj) : AWTEvent() | |
11 | --- gcc-4.1.0-20060223/libjava/classpath/gnu/java/awt/peer/qt/QtToolkit.java.orig 2005-11-16 00:20:01.000000000 +0100 | |
12 | +++ gcc-4.1.0-20060223/libjava/classpath/gnu/java/awt/peer/qt/QtToolkit.java 2006-02-26 17:28:33.311860500 +0100 | |
13 | @@ -137,7 +137,7 @@ | |
14 | eventQueue = new EventQueue(); | |
15 | repaintThread = new QtRepaintThread(); | |
16 | if (Configuration.INIT_LOAD_LIBRARY) | |
17 | - System.loadLibrary("qtpeer"); | |
18 | + System.loadLibrary("-gnu-java-awt-peer-qt"); | |
19 | ||
20 | String theme = null; | |
21 | try | |
22 | --- gcc-4.1.0-20060223/libjava/classpath/configure.ac.orig 2005-12-01 21:09:06.000000000 +0100 | |
23 | +++ gcc-4.1.0-20060223/libjava/classpath/configure.ac 2006-02-26 17:59:25.255599750 +0100 | |
24 | @@ -372,6 +372,9 @@ | |
25 | if test "x${COMPILE_QT_PEER}" = xyes; then | |
26 | PKG_CHECK_MODULES(QT, QtGui >= 4.0.1, HAVE_QT4="yes", HAVE_QT4="no") | |
27 | if test "x$HAVE_QT4" = "xyes"; then | |
28 | + AC_ARG_WITH([qt4dir], | |
29 | + [AS_HELP_STRING([--with-qt4dir=DIR],[Qt4 installation directory.])], | |
30 | + [QT4DIR=$withval]) | |
31 | dnl Check needed because in some cases the QtGui includedir | |
32 | dnl doesn't contain the subsystem dir. | |
33 | QT_INCLUDE_DIR=$($PKG_CONFIG --variable=includedir QtGui) | |
34 | @@ -381,18 +384,13 @@ | |
35 | AC_CHECK_FILE([$EXTRA_QT_INCLUDE_DIR/QWidget], | |
36 | QT_CFLAGS="$QT_CFLAGS -I$EXTRA_QT_INCLUDE_DIR", | |
37 | AC_MSG_WARN([QWidget not found]))) | |
38 | - AC_CHECK_PROG(MOC, [moc], [moc]) | |
39 | + AC_CHECK_PROG(MOC, [moc], [$QT4DIR/bin/moc], [], $QT4DIR/bin) | |
40 | + QT_CFLAGS="$QT_CFLAGS -I\$(top_srcdir)/../../builddir/\$(shell cat \$(top_srcdir)/../../builddir/Makefile |grep ^TARGET_SUBDIR |awk '{ print \$\$3; }')/libstdc++-v3/include -I\$(top_srcdir)/../../builddir/\$(shell cat \$(top_srcdir)/../../builddir/Makefile |grep ^TARGET_SUBDIR |awk '{ print \$\$3; }')/libstdc++-v3/include/\$(shell cat \$(top_srcdir)/../../builddir/Makefile |grep ^TARGET_SUBDIR |awk '{ print \$\$3; }') -I\$(top_srcdir)/../../libstdc++-v3/libsupc++ -I/usr/include/qt4/Qt" | |
41 | fi | |
42 | if test "x$HAVE_QT4" = "xno"; then | |
43 | AC_MSG_NOTICE([Looking for QT_CFLAGS and QT_LIBS without pkg-config]) | |
44 | case "$host_os" in | |
45 | darwin*) | |
46 | - AC_ARG_WITH([qt4dir], | |
47 | - [AS_HELP_STRING([--with-qt4dir=DIR], | |
48 | - [Qt4 installation directory used for OS-X. | |
49 | - For other systems use pkg-config.])], | |
50 | - [QT4DIR=$withval] | |
51 | - ) | |
52 | if test x"$QT4DIR" = x ; then | |
53 | AC_MSG_ERROR([*** No path for Qt4 --with-qt4dir option given]) | |
54 | fi |