classpath-patches
[Top][All Lists]
Advanced
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[cp-patches] Make qt-peers build and run out of the box

From: Mark Wielaard
Subject: [cp-patches] Make qt-peers build and run out of the box
Date: Tue, 23 Aug 2005 20:17:16 +0200 
Hi,

With the latest fixes from Sven and the following patch I am able to
compile and run the qt-peers out of the box using ./configure
--with-qt-peer and using -Dawt.toolkit=gnu.java.awt.peer.qt.QtToolkit
Screenshots at: http://gnu.wildebeest.org/diary/index.php?p=108

We really need Qt 4.0.1 so this updates the requirement.
The qt-peer/Makefile.am was also updated to not need any hacking of the
include paths (this didn't work reliably if the path included multiple
include directories, like with the default Debian install) and to use
the general AM_LDFLAGS and AM_CXXFLAGS (important since the
CLASSPATH_MODULE flags depend on the architecture/os, or Darwin is
weird). To make this all work out of the box a small include cleanup
patch was also needed.

2005-08-23  Mark Wielaard  <address@hidden>

        * configure.ac: Check for QtGui >= 4.0.1.
        * native/jni/qt-peer/.cvsignore: Add slotcallbacks.moc.h.
        * native/jni/qt-peer/Makefile.am (QT_CXXFLAGS): Removed.
        (libqtpeer_la_CXXFLAGS): Removed.
        (libqtpeer_la_LDFLAGS): Removed.
        (AM_LDFLAGS): Set to @CLASSPATH_MODULE@ @address@hidden
        (AM_CXXFLAGS): Set to @address@hidden

        * native/jni/qt-peer/buttonevent.h: Fixup includes.
        * native/jni/qt-peer/componentevent.cpp: Likewise.
        * native/jni/qt-peer/componentevent.h: Likewise.
        * native/jni/qt-peer/containers.h: Likewise.
        * native/jni/qt-peer/keybindings.h: Likewise.
        * native/jni/qt-peer/mainqtthread.cpp: Likewise.
        * native/jni/qt-peer/mainthreadinterface.cpp: Likewise.
        * native/jni/qt-peer/mainthreadinterface.h: Likewise.
        * native/jni/qt-peer/qmatrix.cpp: Likewise.
        * native/jni/qt-peer/qpainterpath.cpp: Likewise.
        * native/jni/qt-peer/qpen.cpp: Likewise.
        * native/jni/qt-peer/qtaudioclip.cpp: Likewise.
        * native/jni/qt-peer/qtbuttonpeer.cpp: Likewise.
        * native/jni/qt-peer/qtcanvaspeer.cpp: Likewise.
        * native/jni/qt-peer/qtcheckboxpeer.cpp: Likewise.
        * native/jni/qt-peer/qtchoicepeer.cpp: Likewise.
        * native/jni/qt-peer/qtcomponent.cpp: Likewise.
        * native/jni/qt-peer/qtcomponent.h: Likewise.
        * native/jni/qt-peer/qtcomponentpeer.cpp: Likewise.
        * native/jni/qt-peer/qtdialogpeer.cpp: Likewise.
        * native/jni/qt-peer/qtembeddedwindowpeer.cpp: Likewise.
        * native/jni/qt-peer/qtfiledialogpeer.cpp: Likewise.
        * native/jni/qt-peer/qtfontmetrics.cpp: Likewise.
        * native/jni/qt-peer/qtfontpeer.cpp: Likewise.
        * native/jni/qt-peer/qtframepeer.cpp: Likewise.
        * native/jni/qt-peer/qtgraphics.cpp: Likewise.
        * native/jni/qt-peer/qtgraphics.h: Likewise.
        * native/jni/qt-peer/qtimage.cpp: Likewise.
        * native/jni/qt-peer/qtimage.h: Likewise.
        * native/jni/qt-peer/qtlabelpeer.cpp: Likewise.
        * native/jni/qt-peer/qtlistpeer.cpp: Likewise.
        * native/jni/qt-peer/qtmenubarpeer.cpp: Likewise.
        * native/jni/qt-peer/qtmenucomponentpeer.cpp: Likewise.
        * native/jni/qt-peer/qtmenuitempeer.cpp: Likewise.
        * native/jni/qt-peer/qtmenupeer.cpp: Likewise.
        * native/jni/qt-peer/qtpanelpeer.cpp: Likewise.
        * native/jni/qt-peer/qtpopupmenupeer.cpp: Likewise.
        * native/jni/qt-peer/qtscreendevice.cpp: Likewise.
        * native/jni/qt-peer/qtscrollbarpeer.cpp: Likewise.
        * native/jni/qt-peer/qtscrollpanepeer.cpp: Likewise.
        * native/jni/qt-peer/qtstrings.h: Likewise.
        * native/jni/qt-peer/qttextareapeer.cpp: Likewise.
        * native/jni/qt-peer/qttextfieldpeer.cpp: Likewise.
        * native/jni/qt-peer/qttoolkit.cpp: Likewise.
        * native/jni/qt-peer/qtvolatileimage.cpp: Likewise.
        * native/jni/qt-peer/qtwindowpeer.cpp: Likewise.
        * native/jni/qt-peer/slotcallbacks.cpp: Likewise.
        * native/jni/qt-peer/slotcallbacks.h: Likewise.

OK to commit?

Cheers,

Mark

Index: configure.ac
===================================================================
RCS file: /cvsroot/classpath/classpath/configure.ac,v
retrieving revision 1.101
diff -u -r1.101 configure.ac
--- configure.ac        23 Aug 2005 13:50:57 -0000      1.101
+++ configure.ac        23 Aug 2005 17:34:50 -0000
@@ -297,7 +297,7 @@
 
   dnl Check for AWT related Qt4
   if test "x${COMPILE_QT_PEER}" = xyes; then
-    PKG_CHECK_MODULES(QT, QtGui >= 4.0)
+    PKG_CHECK_MODULES(QT, QtGui >= 4.0.1)
     AC_CHECK_PROG(MOC, [moc], [moc])
     AC_SUBST(QT_CFLAGS)
     AC_SUBST(QT_LIBS)
Index: native/jni/qt-peer/.cvsignore
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/qt-peer/.cvsignore,v
retrieving revision 1.1
diff -u -r1.1 .cvsignore
--- native/jni/qt-peer/.cvsignore       17 Aug 2005 10:50:33 -0000      1.1
+++ native/jni/qt-peer/.cvsignore       23 Aug 2005 17:34:50 -0000
@@ -6,3 +6,4 @@
 .deps
 Makefile
 Makefile.in
+slotcallbacks.moc.h
Index: native/jni/qt-peer/Makefile.am
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/qt-peer/Makefile.am,v
retrieving revision 1.3
diff -u -r1.3 Makefile.am
--- native/jni/qt-peer/Makefile.am      20 Aug 2005 15:45:53 -0000      1.3
+++ native/jni/qt-peer/Makefile.am      23 Aug 2005 17:34:50 -0000
@@ -3,19 +3,10 @@
 
 pkglib_LTLIBRARIES = libqtpeer.la
 
-QT_CXXFLAGS=`echo $(QT_CFLAGS) | sed 's/include/include\/Qt/'`
-
+AM_LDFLAGS = @CLASSPATH_MODULE@ @QT_LIBS@
 AM_CPPFLAGS = @CLASSPATH_INCLUDES@
 
-libqtpeer_la_CXXFLAGS = \
-       $(QT_CFLAGS) \
-       $(QT_CXXFLAGS)
-
-libqtpeer_la_LDFLAGS = \
-       $(QT_LIBS) \
-       -no-undefined \
-       -module \
-       -release $(PACKAGE_VERSION)
+AM_CXXFLAGS = @QT_CFLAGS@
 
 libqtpeer_la_MOC = \
        slotcallbacks.moc.h
Index: native/jni/qt-peer/buttonevent.h
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/qt-peer/buttonevent.h,v
retrieving revision 1.1
diff -u -r1.1 buttonevent.h
--- native/jni/qt-peer/buttonevent.h    11 Aug 2005 17:06:48 -0000      1.1
+++ native/jni/qt-peer/buttonevent.h    23 Aug 2005 17:34:50 -0000
@@ -1,7 +1,7 @@
 #ifndef BUTTONEVENT_H
 #define BUTTONEVENT_H
 
-#include <QAbstractButton>
+#include <Qt/QAbstractButton>
 #include "mainthreadinterface.h"
 
 class AWTLabelEvent : public AWTEvent {
Index: native/jni/qt-peer/componentevent.cpp
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/qt-peer/componentevent.cpp,v
retrieving revision 1.3
diff -u -r1.3 componentevent.cpp
--- native/jni/qt-peer/componentevent.cpp       23 Aug 2005 02:13:48 -0000      
1.3
+++ native/jni/qt-peer/componentevent.cpp       23 Aug 2005 17:34:50 -0000
@@ -35,8 +35,8 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-#include <QWidget>
-#include <QPoint>
+#include <Qt/QWidget>
+#include <Qt/QPoint>
 
 #include "componentevent.h"
   
Index: native/jni/qt-peer/componentevent.h
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/qt-peer/componentevent.h,v
retrieving revision 1.3
diff -u -r1.3 componentevent.h
--- native/jni/qt-peer/componentevent.h 23 Aug 2005 02:13:48 -0000      1.3
+++ native/jni/qt-peer/componentevent.h 23 Aug 2005 17:34:50 -0000
@@ -2,14 +2,14 @@
 #define CALLBACKEVENT_H
 
 #include <jni.h>
-#include <QWidget>
-#include <QEvent>
-#include <QColor>
-#include <QCursor>
-#include <QFont>
-#include <QPoint>
-#include <QWidget>
-#include <QSize>
+#include <Qt/QWidget>
+#include <Qt/QEvent>
+#include <Qt/QColor>
+#include <Qt/QCursor>
+#include <Qt/QFont>
+#include <Qt/QPoint>
+#include <Qt/QWidget>
+#include <Qt/QSize>
 
 #include "mainthreadinterface.h"
 
Index: native/jni/qt-peer/containers.h
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/qt-peer/containers.h,v
retrieving revision 1.1
diff -u -r1.1 containers.h
--- native/jni/qt-peer/containers.h     11 Aug 2005 17:06:48 -0000      1.1
+++ native/jni/qt-peer/containers.h     23 Aug 2005 17:34:50 -0000
@@ -2,7 +2,7 @@
 #define QTFRAME_H
 
 #include <jni.h>
-#include <QWidget>
+#include <Qt/QWidget>
 
 QWidget *frameChildWidget( JNIEnv *env, jobject component );
 QWidget *scrollPaneChildWidget( JNIEnv *env, jobject component);
Index: native/jni/qt-peer/keybindings.h
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/qt-peer/keybindings.h,v
retrieving revision 1.3
diff -u -r1.3 keybindings.h
--- native/jni/qt-peer/keybindings.h    23 Aug 2005 02:13:48 -0000      1.3
+++ native/jni/qt-peer/keybindings.h    23 Aug 2005 17:34:50 -0000
@@ -1,13 +1,13 @@
 #ifndef KEYBINDINGS_H
 #define KEYBINDINGS_H
 
-#include <QApplication>
-#include <QKeyEvent>
-#include <QMouseEvent>
-#include <QPainter>
-#include <QPoint>
-#include <qwidget.h>
-#include <qstring.h>
+#include <Qt/QApplication>
+#include <Qt/QKeyEvent>
+#include <Qt/QMouseEvent>
+#include <Qt/QPainter>
+#include <Qt/QPoint>
+#include <Qt/qwidget.h>
+#include <Qt/qstring.h>
 #include "qtgraphics.h"
 
 int mapKeyCode(QKeyEvent *key);
Index: native/jni/qt-peer/mainqtthread.cpp
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/qt-peer/mainqtthread.cpp,v
retrieving revision 1.3
diff -u -r1.3 mainqtthread.cpp
--- native/jni/qt-peer/mainqtthread.cpp 21 Aug 2005 00:19:49 -0000      1.3
+++ native/jni/qt-peer/mainqtthread.cpp 23 Aug 2005 17:34:50 -0000
@@ -37,8 +37,8 @@
 
 #include <assert.h>
 #include <jni.h>
-#include <QApplication>
-#include <QThread>
+#include <Qt/QApplication>
+#include <Qt/QThread>
 #include <gnu_java_awt_peer_qt_MainQtThread.h>
 #include "mainthreadinterface.h"
 
Index: native/jni/qt-peer/mainthreadinterface.cpp
===================================================================
RCS file: 
/cvsroot/classpath/classpath/native/jni/qt-peer/mainthreadinterface.cpp,v
retrieving revision 1.2
diff -u -r1.2 mainthreadinterface.cpp
--- native/jni/qt-peer/mainthreadinterface.cpp  21 Aug 2005 00:19:49 -0000      
1.2
+++ native/jni/qt-peer/mainthreadinterface.cpp  23 Aug 2005 17:34:50 -0000
@@ -35,8 +35,8 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-#include <QWidget>
-#include <QThread>
+#include <Qt/QWidget>
+#include <Qt/QThread>
 #include "mainthreadinterface.h"
 
 MainThreadInterface::MainThreadInterface(QApplication *parent) : QObject( 
parent )
Index: native/jni/qt-peer/mainthreadinterface.h
===================================================================
RCS file: 
/cvsroot/classpath/classpath/native/jni/qt-peer/mainthreadinterface.h,v
retrieving revision 1.2
diff -u -r1.2 mainthreadinterface.h
--- native/jni/qt-peer/mainthreadinterface.h    21 Aug 2005 00:19:49 -0000      
1.2
+++ native/jni/qt-peer/mainthreadinterface.h    23 Aug 2005 17:34:50 -0000
@@ -2,10 +2,10 @@
 #define MAINTHREADINTERFACE_H
 
 #include <jni.h>
-#include <QApplication>
-#include <QObject>
-#include <QWidget>
-#include <QEvent>
+#include <Qt/QApplication>
+#include <Qt/QObject>
+#include <Qt/QWidget>
+#include <Qt/QEvent>
 
 class AWTEvent : public QEvent {
   
Index: native/jni/qt-peer/qmatrix.cpp
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/qt-peer/qmatrix.cpp,v
retrieving revision 1.2
diff -u -r1.2 qmatrix.cpp
--- native/jni/qt-peer/qmatrix.cpp      15 Aug 2005 21:53:12 -0000      1.2
+++ native/jni/qt-peer/qmatrix.cpp      23 Aug 2005 17:34:50 -0000
@@ -36,7 +36,7 @@
 exception statement from your version. */
 
 #include <assert.h>
-#include <QMatrix>
+#include <Qt/QMatrix>
 #include <gnu_java_awt_peer_qt_QMatrix.h>
 #include "nativewrapper.h"
 
Index: native/jni/qt-peer/qpainterpath.cpp
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/qt-peer/qpainterpath.cpp,v
retrieving revision 1.2
diff -u -r1.2 qpainterpath.cpp
--- native/jni/qt-peer/qpainterpath.cpp 15 Aug 2005 21:53:12 -0000      1.2
+++ native/jni/qt-peer/qpainterpath.cpp 23 Aug 2005 17:34:50 -0000
@@ -36,7 +36,7 @@
 exception statement from your version. */
 
 #include <assert.h>
-#include <QPainterPath>
+#include <Qt/QPainterPath>
 #include <gnu_java_awt_peer_qt_QPainterPath.h>
 #include "nativewrapper.h"
 
Index: native/jni/qt-peer/qpen.cpp
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/qt-peer/qpen.cpp,v
retrieving revision 1.2
diff -u -r1.2 qpen.cpp
--- native/jni/qt-peer/qpen.cpp 15 Aug 2005 21:53:12 -0000      1.2
+++ native/jni/qt-peer/qpen.cpp 23 Aug 2005 17:34:50 -0000
@@ -36,8 +36,8 @@
 exception statement from your version. */
 
 #include <assert.h>
-#include <QColor>
-#include <QPen>
+#include <Qt/QColor>
+#include <Qt/QPen>
 #include <gnu_java_awt_peer_qt_QPen.h>
 #include "nativewrapper.h"
 
Index: native/jni/qt-peer/qtaudioclip.cpp
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/qt-peer/qtaudioclip.cpp,v
retrieving revision 1.1
diff -u -r1.1 qtaudioclip.cpp
--- native/jni/qt-peer/qtaudioclip.cpp  11 Aug 2005 17:06:48 -0000      1.1
+++ native/jni/qt-peer/qtaudioclip.cpp  23 Aug 2005 17:34:50 -0000
@@ -37,8 +37,8 @@
 
 #include <jni.h>
 #include <assert.h>
-#include <QString>
-#include <QSound>
+#include <Qt/QString>
+#include <Qt/QSound>
 #include <gnu_java_awt_peer_qt_QtAudioClip.h>
 #include "qtstrings.h"
 #include "nativewrapper.h"
Index: native/jni/qt-peer/qtbuttonpeer.cpp
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/qt-peer/qtbuttonpeer.cpp,v
retrieving revision 1.3
diff -u -r1.3 qtbuttonpeer.cpp
--- native/jni/qt-peer/qtbuttonpeer.cpp 16 Aug 2005 23:22:09 -0000      1.3
+++ native/jni/qt-peer/qtbuttonpeer.cpp 23 Aug 2005 17:34:50 -0000
@@ -36,9 +36,9 @@
 exception statement from your version. */
 
 #include <assert.h>
-#include <QMainWindow>
-#include <QPushButton>
-#include <QFont>
+#include <Qt/QMainWindow>
+#include <Qt/QPushButton>
+#include <Qt/QFont>
 #include <gnu_java_awt_peer_qt_QtButtonPeer.h>
 #include "qtcomponent.h"
 #include "qtstrings.h"
Index: native/jni/qt-peer/qtcanvaspeer.cpp
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/qt-peer/qtcanvaspeer.cpp,v
retrieving revision 1.3
diff -u -r1.3 qtcanvaspeer.cpp
--- native/jni/qt-peer/qtcanvaspeer.cpp 16 Aug 2005 23:22:09 -0000      1.3
+++ native/jni/qt-peer/qtcanvaspeer.cpp 23 Aug 2005 17:34:50 -0000
@@ -36,8 +36,8 @@
 exception statement from your version. */
 
 #include <assert.h>
-#include <QMainWindow>
-#include <QWidget>
+#include <Qt/QMainWindow>
+#include <Qt/QWidget>
 #include <gnu_java_awt_peer_qt_QtCanvasPeer.h>
 #include "qtcomponent.h"
 #include "keybindings.h"
Index: native/jni/qt-peer/qtcheckboxpeer.cpp
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/qt-peer/qtcheckboxpeer.cpp,v
retrieving revision 1.3
diff -u -r1.3 qtcheckboxpeer.cpp
--- native/jni/qt-peer/qtcheckboxpeer.cpp       16 Aug 2005 23:22:09 -0000      
1.3
+++ native/jni/qt-peer/qtcheckboxpeer.cpp       23 Aug 2005 17:34:50 -0000
@@ -36,9 +36,9 @@
 exception statement from your version. */
 
 #include <assert.h>
-#include <QAbstractButton>
-#include <QCheckBox>
-#include <QRadioButton>
+#include <Qt/QAbstractButton>
+#include <Qt/QCheckBox>
+#include <Qt/QRadioButton>
 #include <gnu_java_awt_peer_qt_QtCheckboxPeer.h>
 #include "qtstrings.h"
 #include "qtcomponent.h"
Index: native/jni/qt-peer/qtchoicepeer.cpp
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/qt-peer/qtchoicepeer.cpp,v
retrieving revision 1.3
diff -u -r1.3 qtchoicepeer.cpp
--- native/jni/qt-peer/qtchoicepeer.cpp 16 Aug 2005 23:22:09 -0000      1.3
+++ native/jni/qt-peer/qtchoicepeer.cpp 23 Aug 2005 17:34:50 -0000
@@ -36,7 +36,7 @@
 exception statement from your version. */
 
 #include <assert.h>
-#include <QComboBox>
+#include <Qt/QComboBox>
 #include <gnu_java_awt_peer_qt_QtChoicePeer.h>
 #include "qtcomponent.h"
 #include "qtstrings.h"
Index: native/jni/qt-peer/qtcomponent.cpp
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/qt-peer/qtcomponent.cpp,v
retrieving revision 1.2
diff -u -r1.2 qtcomponent.cpp
--- native/jni/qt-peer/qtcomponent.cpp  16 Aug 2005 23:22:09 -0000      1.2
+++ native/jni/qt-peer/qtcomponent.cpp  23 Aug 2005 17:34:50 -0000
@@ -37,8 +37,8 @@
 
 #include <jni.h>
 #include <assert.h>
-#include <qmainwindow.h>
-#include <qwidget.h>
+#include <Qt/qmainwindow.h>
+#include <Qt/qwidget.h>
 #include "qtcomponent.h"
 #include "containers.h"
 
Index: native/jni/qt-peer/qtcomponent.h
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/qt-peer/qtcomponent.h,v
retrieving revision 1.1
diff -u -r1.1 qtcomponent.h
--- native/jni/qt-peer/qtcomponent.h    11 Aug 2005 17:06:48 -0000      1.1
+++ native/jni/qt-peer/qtcomponent.h    23 Aug 2005 17:34:50 -0000
@@ -1,8 +1,8 @@
 #ifndef QTCOMPONENT_H
 #define QTCOMPONENT_H
 
-#include <QSize>
-#include <QPoint>
+#include <Qt/QSize>
+#include <Qt/QPoint>
 //#include <cassert.h>
 #include <jni.h>
 #include "nativewrapper.h"
Index: native/jni/qt-peer/qtcomponentpeer.cpp
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/qt-peer/qtcomponentpeer.cpp,v
retrieving revision 1.5
diff -u -r1.5 qtcomponentpeer.cpp
--- native/jni/qt-peer/qtcomponentpeer.cpp      23 Aug 2005 02:13:48 -0000      
1.5
+++ native/jni/qt-peer/qtcomponentpeer.cpp      23 Aug 2005 17:34:50 -0000
@@ -36,13 +36,13 @@
 exception statement from your version. */
 
 #include <assert.h>
-#include <QApplication>
-#include <QDesktopWidget>
-#include <QShowEvent>
-#include <QHideEvent>
-#include <QColor>
-#include <QCursor>
-#include <QWidget>
+#include <Qt/QApplication>
+#include <Qt/QDesktopWidget>
+#include <Qt/QShowEvent>
+#include <Qt/QHideEvent>
+#include <Qt/QColor>
+#include <Qt/QCursor>
+#include <Qt/QWidget>
 #include <gnu_java_awt_peer_qt_QtComponentPeer.h>
 #include "qtcomponent.h"
 #include "componentevent.h"
Index: native/jni/qt-peer/qtdialogpeer.cpp
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/qt-peer/qtdialogpeer.cpp,v
retrieving revision 1.3
diff -u -r1.3 qtdialogpeer.cpp
--- native/jni/qt-peer/qtdialogpeer.cpp 16 Aug 2005 23:22:09 -0000      1.3
+++ native/jni/qt-peer/qtdialogpeer.cpp 23 Aug 2005 17:34:50 -0000
@@ -36,7 +36,7 @@
 exception statement from your version. */
 
 #include <assert.h>
-#include <qdialog.h>
+#include <Qt/qdialog.h>
 #include <gnu_java_awt_peer_qt_QtDialogPeer.h>
 #include "qtcomponent.h"
 #include "containers.h"
Index: native/jni/qt-peer/qtembeddedwindowpeer.cpp
===================================================================
RCS file: 
/cvsroot/classpath/classpath/native/jni/qt-peer/qtembeddedwindowpeer.cpp,v
retrieving revision 1.1
diff -u -r1.1 qtembeddedwindowpeer.cpp
--- native/jni/qt-peer/qtembeddedwindowpeer.cpp 16 Aug 2005 23:22:09 -0000      
1.1
+++ native/jni/qt-peer/qtembeddedwindowpeer.cpp 23 Aug 2005 17:34:50 -0000
@@ -36,8 +36,8 @@
 exception statement from your version. */
 
 #include <assert.h>
-#include <QWidget>
-#include <QX11EmbedWidget>
+#include <Qt/QWidget>
+#include <Qt/QX11EmbedWidget>
 #include <gnu_java_awt_peer_qt_QtEmbeddedWindowPeer.h>
 #include "qtcomponent.h"
 #include "keybindings.h"
Index: native/jni/qt-peer/qtfiledialogpeer.cpp
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/qt-peer/qtfiledialogpeer.cpp,v
retrieving revision 1.2
diff -u -r1.2 qtfiledialogpeer.cpp
--- native/jni/qt-peer/qtfiledialogpeer.cpp     15 Aug 2005 21:53:12 -0000      
1.2
+++ native/jni/qt-peer/qtfiledialogpeer.cpp     23 Aug 2005 17:34:50 -0000
@@ -36,8 +36,8 @@
 exception statement from your version. */
 
 #include <assert.h>
-#include <QFileDialog>
-#include <QDialog>
+#include <Qt/QFileDialog>
+#include <Qt/QDialog>
 #include <gnu_java_awt_peer_qt_QtFileDialogPeer.h>
 #include "qtcomponent.h"
 #include "qtstrings.h"
Index: native/jni/qt-peer/qtfontmetrics.cpp
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/qt-peer/qtfontmetrics.cpp,v
retrieving revision 1.2
diff -u -r1.2 qtfontmetrics.cpp
--- native/jni/qt-peer/qtfontmetrics.cpp        15 Aug 2005 21:53:12 -0000      
1.2
+++ native/jni/qt-peer/qtfontmetrics.cpp        23 Aug 2005 17:34:50 -0000
@@ -36,13 +36,13 @@
 exception statement from your version. */
 
 #include <assert.h>
-#include <QChar>
-#include <QFont>
-#include <QFontMetrics>
-#include <QString>
-#include <QPainter>
-#include <QStringList>
-#include <QFontDatabase>
+#include <Qt/QChar>
+#include <Qt/QFont>
+#include <Qt/QFontMetrics>
+#include <Qt/QString>
+#include <Qt/QPainter>
+#include <Qt/QStringList>
+#include <Qt/QFontDatabase>
 #include <gnu_java_awt_peer_qt_QtFontMetrics.h>
 #include "qtfont.h"
 #include "qtstrings.h"
Index: native/jni/qt-peer/qtfontpeer.cpp
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/qt-peer/qtfontpeer.cpp,v
retrieving revision 1.2
diff -u -r1.2 qtfontpeer.cpp
--- native/jni/qt-peer/qtfontpeer.cpp   15 Aug 2005 21:53:12 -0000      1.2
+++ native/jni/qt-peer/qtfontpeer.cpp   23 Aug 2005 17:34:50 -0000
@@ -36,8 +36,8 @@
 exception statement from your version. */
 
 #include <assert.h>
-#include <QFont>
-#include <QString>
+#include <Qt/QFont>
+#include <Qt/QString>
 #include <gnu_java_awt_peer_qt_QtFontPeer.h>
 #include "qtfont.h"
 #include "qtstrings.h"
Index: native/jni/qt-peer/qtframepeer.cpp
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/qt-peer/qtframepeer.cpp,v
retrieving revision 1.5
diff -u -r1.5 qtframepeer.cpp
--- native/jni/qt-peer/qtframepeer.cpp  23 Aug 2005 02:13:48 -0000      1.5
+++ native/jni/qt-peer/qtframepeer.cpp  23 Aug 2005 17:34:51 -0000
@@ -36,13 +36,13 @@
 exception statement from your version. */
 
 #include <assert.h>
-#include <QApplication>
-#include <QIcon>
-#include <QMainWindow>
-#include <QMenuBar>
-#include <QPixmap>
-#include <QToolBar>
-#include <QThread>
+#include <Qt/QApplication>
+#include <Qt/QIcon>
+#include <Qt/QMainWindow>
+#include <Qt/QMenuBar>
+#include <Qt/QPixmap>
+#include <Qt/QToolBar>
+#include <Qt/QThread>
 #include <gnu_java_awt_peer_qt_QtFramePeer.h>
 #include "qtcomponent.h"
 #include "qtstrings.h"
Index: native/jni/qt-peer/qtgraphics.cpp
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/qt-peer/qtgraphics.cpp,v
retrieving revision 1.5
diff -u -r1.5 qtgraphics.cpp
--- native/jni/qt-peer/qtgraphics.cpp   23 Aug 2005 02:13:48 -0000      1.5
+++ native/jni/qt-peer/qtgraphics.cpp   23 Aug 2005 17:34:51 -0000
@@ -37,14 +37,14 @@
 
 #include <assert.h>
 #include <jni.h>
-#include <QPainter>
-#include <QBrush>
-#include <QLinearGradient>
-#include <QPen>
-#include <QPaintDevice>
-#include <QPainterPath>
-#include <QImage>
-#include <QColor>
+#include <Qt/QPainter>
+#include <Qt/QBrush>
+#include <Qt/QLinearGradient>
+#include <Qt/QPen>
+#include <Qt/QPaintDevice>
+#include <Qt/QPainterPath>
+#include <Qt/QImage>
+#include <Qt/QColor>
 #include <gnu_java_awt_peer_qt_QtGraphics.h>
 #include "nativewrapper.h"
 #include "qtimage.h"
Index: native/jni/qt-peer/qtgraphics.h
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/qt-peer/qtgraphics.h,v
retrieving revision 1.1
diff -u -r1.1 qtgraphics.h
--- native/jni/qt-peer/qtgraphics.h     11 Aug 2005 17:06:48 -0000      1.1
+++ native/jni/qt-peer/qtgraphics.h     23 Aug 2005 17:34:51 -0000
@@ -2,10 +2,10 @@
 #define QTGRAPHICS_H
 
 #include <jni.h>
-#include <QPainter>
-#include <QPaintDevice>
-#include <QPen>
-#include <QBrush>
+#include <Qt/QPainter>
+#include <Qt/QPaintDevice>
+#include <Qt/QPen>
+#include <Qt/QBrush>
 
 class GraphicsPainter : public QPainter
 {
Index: native/jni/qt-peer/qtimage.cpp
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/qt-peer/qtimage.cpp,v
retrieving revision 1.3
diff -u -r1.3 qtimage.cpp
--- native/jni/qt-peer/qtimage.cpp      16 Aug 2005 23:22:09 -0000      1.3
+++ native/jni/qt-peer/qtimage.cpp      23 Aug 2005 17:34:51 -0000
@@ -36,10 +36,10 @@
 exception statement from your version. */
 
 #include <assert.h>
-#include <QImage>
-#include <QColor>
-#include <QMatrix>
-#include <QPainter>
+#include <Qt/QImage>
+#include <Qt/QColor>
+#include <Qt/QMatrix>
+#include <Qt/QPainter>
 #include <gnu_java_awt_peer_qt_QtImage.h>
 #include "qtimage.h"
 #include "qtstrings.h"
Index: native/jni/qt-peer/qtimage.h
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/qt-peer/qtimage.h,v
retrieving revision 1.2
diff -u -r1.2 qtimage.h
--- native/jni/qt-peer/qtimage.h        23 Aug 2005 02:13:48 -0000      1.2
+++ native/jni/qt-peer/qtimage.h        23 Aug 2005 17:34:51 -0000
@@ -1,8 +1,8 @@
 #ifndef QTIMAGE_H
 #define QTIMAGE_H
 
-#include <QImage>
-#include <QPixmap>
+#include <Qt/QImage>
+#include <Qt/QPixmap>
 
 QImage *getQtImage( JNIEnv *env, jobject obj );
 QPixmap *getQtVolatileImage( JNIEnv *env, jobject obj );
Index: native/jni/qt-peer/qtlabelpeer.cpp
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/qt-peer/qtlabelpeer.cpp,v
retrieving revision 1.4
diff -u -r1.4 qtlabelpeer.cpp
--- native/jni/qt-peer/qtlabelpeer.cpp  23 Aug 2005 02:13:48 -0000      1.4
+++ native/jni/qt-peer/qtlabelpeer.cpp  23 Aug 2005 17:34:51 -0000
@@ -36,8 +36,8 @@
 exception statement from your version. */
 
 #include <assert.h>
-#include <QLabel>
-#include <QString>
+#include <Qt/QLabel>
+#include <Qt/QString>
 #include <gnu_java_awt_peer_qt_QtLabelPeer.h>
 #include "qtcomponent.h"
 #include "qtstrings.h"
Index: native/jni/qt-peer/qtlistpeer.cpp
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/qt-peer/qtlistpeer.cpp,v
retrieving revision 1.3
diff -u -r1.3 qtlistpeer.cpp
--- native/jni/qt-peer/qtlistpeer.cpp   16 Aug 2005 23:22:09 -0000      1.3
+++ native/jni/qt-peer/qtlistpeer.cpp   23 Aug 2005 17:34:51 -0000
@@ -36,8 +36,8 @@
 exception statement from your version. */
 
 #include <assert.h>
-#include <QWidget>
-#include <QListWidget>
+#include <Qt/QWidget>
+#include <Qt/QListWidget>
 #include <gnu_java_awt_peer_qt_QtListPeer.h>
 #include "qtcomponent.h"
 #include "qtstrings.h"
Index: native/jni/qt-peer/qtmenubarpeer.cpp
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/qt-peer/qtmenubarpeer.cpp,v
retrieving revision 1.2
diff -u -r1.2 qtmenubarpeer.cpp
--- native/jni/qt-peer/qtmenubarpeer.cpp        15 Aug 2005 21:53:12 -0000      
1.2
+++ native/jni/qt-peer/qtmenubarpeer.cpp        23 Aug 2005 17:34:51 -0000
@@ -36,11 +36,11 @@
 exception statement from your version. */
 
 #include <assert.h>
-#include <QMenuBar>
-#include <QToolBar>
-#include <QMenu>
-#include <QList>
-#include <QThread>
+#include <Qt/QMenuBar>
+#include <Qt/QToolBar>
+#include <Qt/QMenu>
+#include <Qt/QList>
+#include <Qt/QThread>
 #include <gnu_java_awt_peer_qt_QtMenuBarPeer.h>
 #include "nativewrapper.h"
 #include "qtstrings.h"
Index: native/jni/qt-peer/qtmenucomponentpeer.cpp
===================================================================
RCS file: 
/cvsroot/classpath/classpath/native/jni/qt-peer/qtmenucomponentpeer.cpp,v
retrieving revision 1.3
diff -u -r1.3 qtmenucomponentpeer.cpp
--- native/jni/qt-peer/qtmenucomponentpeer.cpp  23 Aug 2005 02:13:48 -0000      
1.3
+++ native/jni/qt-peer/qtmenucomponentpeer.cpp  23 Aug 2005 17:34:51 -0000
@@ -36,7 +36,7 @@
 exception statement from your version. */
 
 #include <assert.h>
-#include <QWidget>
+#include <Qt/QWidget>
 #include <gnu_java_awt_peer_qt_QtMenuComponentPeer.h>
 #include "nativewrapper.h"
 #include "componentevent.h"
Index: native/jni/qt-peer/qtmenuitempeer.cpp
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/qt-peer/qtmenuitempeer.cpp,v
retrieving revision 1.2
diff -u -r1.2 qtmenuitempeer.cpp
--- native/jni/qt-peer/qtmenuitempeer.cpp       15 Aug 2005 21:53:12 -0000      
1.2
+++ native/jni/qt-peer/qtmenuitempeer.cpp       23 Aug 2005 17:34:51 -0000
@@ -36,9 +36,9 @@
 exception statement from your version. */
 
 #include <assert.h>
-#include <QMenu>
-#include <QAction>
-#include <QThread>
+#include <Qt/QMenu>
+#include <Qt/QAction>
+#include <Qt/QThread>
 #include <gnu_java_awt_peer_qt_QtMenuItemPeer.h>
 #include "nativewrapper.h"
 #include "qtstrings.h"
Index: native/jni/qt-peer/qtmenupeer.cpp
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/qt-peer/qtmenupeer.cpp,v
retrieving revision 1.4
diff -u -r1.4 qtmenupeer.cpp
--- native/jni/qt-peer/qtmenupeer.cpp   23 Aug 2005 02:13:48 -0000      1.4
+++ native/jni/qt-peer/qtmenupeer.cpp   23 Aug 2005 17:34:51 -0000
@@ -36,7 +36,7 @@
 exception statement from your version. */
 
 #include <assert.h>
-#include <QMenu>
+#include <Qt/QMenu>
 #include <gnu_java_awt_peer_qt_QtMenuPeer.h>
 #include "nativewrapper.h"
 #include "qtstrings.h"
Index: native/jni/qt-peer/qtpanelpeer.cpp
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/qt-peer/qtpanelpeer.cpp,v
retrieving revision 1.3
diff -u -r1.3 qtpanelpeer.cpp
--- native/jni/qt-peer/qtpanelpeer.cpp  16 Aug 2005 23:22:09 -0000      1.3
+++ native/jni/qt-peer/qtpanelpeer.cpp  23 Aug 2005 17:34:51 -0000
@@ -36,7 +36,7 @@
 exception statement from your version. */
 
 #include <assert.h>
-#include <qwidget.h>
+#include <Qt/qwidget.h>
 #include <gnu_java_awt_peer_qt_QtPanelPeer.h>
 #include "qtcomponent.h"
 #include "keybindings.h"
Index: native/jni/qt-peer/qtpopupmenupeer.cpp
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/qt-peer/qtpopupmenupeer.cpp,v
retrieving revision 1.2
diff -u -r1.2 qtpopupmenupeer.cpp
--- native/jni/qt-peer/qtpopupmenupeer.cpp      15 Aug 2005 21:53:12 -0000      
1.2
+++ native/jni/qt-peer/qtpopupmenupeer.cpp      23 Aug 2005 17:34:51 -0000
@@ -36,9 +36,9 @@
 exception statement from your version. */
 
 #include <assert.h>
-#include <QMenu>
-#include <QPoint>
-#include <QWidget>
+#include <Qt/QMenu>
+#include <Qt/QPoint>
+#include <Qt/QWidget>
 #include <gnu_java_awt_peer_qt_QtPopupMenuPeer.h>
 #include "nativewrapper.h"
 #include "qtstrings.h"
Index: native/jni/qt-peer/qtscreendevice.cpp
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/qt-peer/qtscreendevice.cpp,v
retrieving revision 1.2
diff -u -r1.2 qtscreendevice.cpp
--- native/jni/qt-peer/qtscreendevice.cpp       15 Aug 2005 21:53:12 -0000      
1.2
+++ native/jni/qt-peer/qtscreendevice.cpp       23 Aug 2005 17:34:51 -0000
@@ -36,8 +36,8 @@
 exception statement from your version. */
 
 #include <assert.h>
-#include <QApplication>
-#include <QDesktopWidget>
+#include <Qt/QApplication>
+#include <Qt/QDesktopWidget>
 #include <gnu_java_awt_peer_qt_QtScreenDevice.h>
 #include "nativewrapper.h"
 
Index: native/jni/qt-peer/qtscrollbarpeer.cpp
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/qt-peer/qtscrollbarpeer.cpp,v
retrieving revision 1.3
diff -u -r1.3 qtscrollbarpeer.cpp
--- native/jni/qt-peer/qtscrollbarpeer.cpp      16 Aug 2005 23:22:09 -0000      
1.3
+++ native/jni/qt-peer/qtscrollbarpeer.cpp      23 Aug 2005 17:34:51 -0000
@@ -36,7 +36,7 @@
 exception statement from your version. */
 
 #include <assert.h>
-#include <QScrollBar>
+#include <Qt/QScrollBar>
 #include <gnu_java_awt_peer_qt_QtScrollbarPeer.h>
 #include "keybindings.h"
 #include "slotcallbacks.h"
Index: native/jni/qt-peer/qtscrollpanepeer.cpp
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/qt-peer/qtscrollpanepeer.cpp,v
retrieving revision 1.4
diff -u -r1.4 qtscrollpanepeer.cpp
--- native/jni/qt-peer/qtscrollpanepeer.cpp     23 Aug 2005 02:13:48 -0000      
1.4
+++ native/jni/qt-peer/qtscrollpanepeer.cpp     23 Aug 2005 17:34:51 -0000
@@ -36,8 +36,8 @@
 exception statement from your version. */
 
 #include <assert.h>
-#include <QScrollArea>
-#include <QScrollBar>
+#include <Qt/QScrollArea>
+#include <Qt/QScrollBar>
 #include <gnu_java_awt_peer_qt_QtScrollPanePeer.h>
 #include "qtcomponent.h"
 #include "containers.h"
Index: native/jni/qt-peer/qtstrings.h
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/qt-peer/qtstrings.h,v
retrieving revision 1.1
diff -u -r1.1 qtstrings.h
--- native/jni/qt-peer/qtstrings.h      11 Aug 2005 17:06:48 -0000      1.1
+++ native/jni/qt-peer/qtstrings.h      23 Aug 2005 17:34:51 -0000
@@ -2,7 +2,7 @@
 #define QTSTRINGS_H
 
 #include <jni.h>
-#include <QString>
+#include <Qt/QString>
 
 QString *getQString(JNIEnv *env, jstring str);
 jstring getJavaString(JNIEnv *env, QString *qstring);
Index: native/jni/qt-peer/qttextareapeer.cpp
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/qt-peer/qttextareapeer.cpp,v
retrieving revision 1.3
diff -u -r1.3 qttextareapeer.cpp
--- native/jni/qt-peer/qttextareapeer.cpp       16 Aug 2005 23:22:09 -0000      
1.3
+++ native/jni/qt-peer/qttextareapeer.cpp       23 Aug 2005 17:34:51 -0000
@@ -37,8 +37,8 @@
 
 #include <assert.h>
 #include <time.h>
-#include <QTextEdit>
-#include <QTextCursor>
+#include <Qt/QTextEdit>
+#include <Qt/QTextCursor>
 #include <gnu_java_awt_peer_qt_QtTextAreaPeer.h>
 #include "mainthreadinterface.h"
 #include "componentevent.h"
Index: native/jni/qt-peer/qttextfieldpeer.cpp
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/qt-peer/qttextfieldpeer.cpp,v
retrieving revision 1.5
diff -u -r1.5 qttextfieldpeer.cpp
--- native/jni/qt-peer/qttextfieldpeer.cpp      23 Aug 2005 10:37:08 -0000      
1.5
+++ native/jni/qt-peer/qttextfieldpeer.cpp      23 Aug 2005 17:34:51 -0000
@@ -36,8 +36,8 @@
 exception statement from your version. */
 
 #include <assert.h>
-#include <QLineEdit>
-#include <QWidget>
+#include <Qt/QLineEdit>
+#include <Qt/QWidget>
 #include <gnu_java_awt_peer_qt_QtTextFieldPeer.h>
 #include "qtcomponent.h"
 #include "qtstrings.h"
Index: native/jni/qt-peer/qttoolkit.cpp
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/qt-peer/qttoolkit.cpp,v
retrieving revision 1.1
diff -u -r1.1 qttoolkit.cpp
--- native/jni/qt-peer/qttoolkit.cpp    11 Aug 2005 17:06:48 -0000      1.1
+++ native/jni/qt-peer/qttoolkit.cpp    23 Aug 2005 17:34:51 -0000
@@ -35,11 +35,11 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-#include <QApplication>
-#include <QDesktopWidget>
-#include <QString>
-#include <QStringList>
-#include <QFontDatabase>
+#include <Qt/QApplication>
+#include <Qt/QDesktopWidget>
+#include <Qt/QString>
+#include <Qt/QStringList>
+#include <Qt/QFontDatabase>
 #include <gnu_java_awt_peer_qt_QtToolkit.h>
 #include "qtcomponent.h"
 #include "mainthreadinterface.h"
Index: native/jni/qt-peer/qtvolatileimage.cpp
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/qt-peer/qtvolatileimage.cpp,v
retrieving revision 1.3
diff -u -r1.3 qtvolatileimage.cpp
--- native/jni/qt-peer/qtvolatileimage.cpp      23 Aug 2005 02:13:48 -0000      
1.3
+++ native/jni/qt-peer/qtvolatileimage.cpp      23 Aug 2005 17:34:51 -0000
@@ -36,11 +36,11 @@
 exception statement from your version. */
 
 #include <assert.h>
-#include <QPixmap>
-#include <QImage>
-#include <QColor>
-#include <QMatrix>
-#include <QPainter>
+#include <Qt/QPixmap>
+#include <Qt/QImage>
+#include <Qt/QColor>
+#include <Qt/QMatrix>
+#include <Qt/QPainter>
 #include <gnu_java_awt_peer_qt_QtVolatileImage.h>
 #include "qtimage.h"
 #include "qtstrings.h"
Index: native/jni/qt-peer/qtwindowpeer.cpp
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/qt-peer/qtwindowpeer.cpp,v
retrieving revision 1.4
diff -u -r1.4 qtwindowpeer.cpp
--- native/jni/qt-peer/qtwindowpeer.cpp 23 Aug 2005 02:13:48 -0000      1.4
+++ native/jni/qt-peer/qtwindowpeer.cpp 23 Aug 2005 17:34:51 -0000
@@ -36,8 +36,8 @@
 exception statement from your version. */
 
 #include <assert.h>
-#include <QWidget>
-#include <qstyle.h>
+#include <Qt/QWidget>
+#include <Qt/qstyle.h>
 #include <gnu_java_awt_peer_qt_QtWindowPeer.h>
 #include "qtcomponent.h"
 #include "keybindings.h"
Index: native/jni/qt-peer/slotcallbacks.cpp
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/qt-peer/slotcallbacks.cpp,v
retrieving revision 1.2
diff -u -r1.2 slotcallbacks.cpp
--- native/jni/qt-peer/slotcallbacks.cpp        16 Aug 2005 23:22:09 -0000      
1.2
+++ native/jni/qt-peer/slotcallbacks.cpp        23 Aug 2005 17:34:51 -0000
@@ -35,15 +35,15 @@
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
 
-#include <QObject>
-#include <QAbstractButton>
-#include <QAbstractSlider>
-#include <QAction>
-#include <QComboBox>
-#include <QListWidget>
-#include <QLineEdit>
-#include <QPushButton>
-#include <QTextEdit>
+#include <Qt/QObject>
+#include <Qt/QAbstractButton>
+#include <Qt/QAbstractSlider>
+#include <Qt/QAction>
+#include <Qt/QComboBox>
+#include <Qt/QListWidget>
+#include <Qt/QLineEdit>
+#include <Qt/QPushButton>
+#include <Qt/QTextEdit>
 #include <gnu_java_awt_peer_qt_QtButtonPeer.h>
 #include "qtcomponent.h"
 #include "qtstrings.h"
Index: native/jni/qt-peer/slotcallbacks.h
===================================================================
RCS file: /cvsroot/classpath/classpath/native/jni/qt-peer/slotcallbacks.h,v
retrieving revision 1.2
diff -u -r1.2 slotcallbacks.h
--- native/jni/qt-peer/slotcallbacks.h  16 Aug 2005 23:22:09 -0000      1.2
+++ native/jni/qt-peer/slotcallbacks.h  23 Aug 2005 17:34:51 -0000
@@ -1,15 +1,15 @@
 #ifndef SLOTCALLBACKS_H
 #define SLOTCALLBACKS_H
 
-#include <QAbstractButton>
-#include <QAbstractSlider>
-#include <QAction>
-#include <QComboBox>
-#include <QListWidget>
-#include <QLineEdit>
-#include <QPushButton>
-#include <QScrollBar>
-#include <QTextEdit>
+#include <Qt/QAbstractButton>
+#include <Qt/QAbstractSlider>
+#include <Qt/QAction>
+#include <Qt/QComboBox>
+#include <Qt/QListWidget>
+#include <Qt/QLineEdit>
+#include <Qt/QPushButton>
+#include <Qt/QScrollBar>
+#include <Qt/QTextEdit>
 #include <jni.h>
 
 void connectButton(QPushButton *button, JNIEnv *env, jobject buttonobj);

Attachment: signature.asc
Description: This is a digitally signed message part

reply via email to
[Prev in Thread] Current Thread [Next in Thread]