diff options
| author | gandalf <gandalf@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-03-23 15:19:26 +0000 |
|---|---|---|
| committer | gandalf <gandalf@138bc75d-0d04-0410-961f-82ee72b054a4> | 2012-03-23 15:19:26 +0000 |
| commit | 5c7411981584e487ac41794feb98a66df9fd6fcb (patch) | |
| tree | febe3d4d4c0c994db223fee8e819bde6582494c9 /libjava/classpath/include/gnu_java_awt_peer_qt_QtEmbeddedWindowPeer.h | |
| parent | 112dfe9f689af01c2dd00e0f153fc25d69095b6c (diff) | |
| download | ppe42-gcc-5c7411981584e487ac41794feb98a66df9fd6fcb.tar.gz ppe42-gcc-5c7411981584e487ac41794feb98a66df9fd6fcb.zip | |
Merge GNU Classpath 0.99 into libjava.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@185741 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/classpath/include/gnu_java_awt_peer_qt_QtEmbeddedWindowPeer.h')
| -rw-r--r-- | libjava/classpath/include/gnu_java_awt_peer_qt_QtEmbeddedWindowPeer.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libjava/classpath/include/gnu_java_awt_peer_qt_QtEmbeddedWindowPeer.h b/libjava/classpath/include/gnu_java_awt_peer_qt_QtEmbeddedWindowPeer.h index 8913a3b38be..748f02dc044 100644 --- a/libjava/classpath/include/gnu_java_awt_peer_qt_QtEmbeddedWindowPeer.h +++ b/libjava/classpath/include/gnu_java_awt_peer_qt_QtEmbeddedWindowPeer.h @@ -13,6 +13,9 @@ extern "C" JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtEmbeddedWindowPeer_init (JNIEnv *env, jobject); JNIEXPORT void JNICALL Java_gnu_java_awt_peer_qt_QtEmbeddedWindowPeer_embed (JNIEnv *env, jobject, jlong); +#undef gnu_java_awt_peer_qt_QtComponentPeer_POPUP_TRIGGER +#define gnu_java_awt_peer_qt_QtComponentPeer_POPUP_TRIGGER 3L + #ifdef __cplusplus } #endif |
