diff options
| author | Volker Grabsch <vog@notjusthosting.com> | 2009-10-05 10:40:31 (GMT) |
|---|---|---|
| committer | Volker Grabsch <vog@notjusthosting.com> | 2009-10-05 10:40:31 (GMT) |
| commit | 1bd9dbd14b2e38c1e8ebb77b9818c2c8f287316e (patch) | |
| tree | 86fedd9646a17b9e46066889bffa1da948e1d3f4 /src/qt-win32.patch | |
| parent | 80dcaeb8946122e471bf65adece6801c026e9b83 (diff) | |
| download | mxe-1bd9dbd14b2e38c1e8ebb77b9818c2c8f287316e.zip mxe-1bd9dbd14b2e38c1e8ebb77b9818c2c8f287316e.tar.gz mxe-1bd9dbd14b2e38c1e8ebb77b9818c2c8f287316e.tar.bz2 | |
simplified qt-win32 patch (by Mark Brand)
Diffstat (limited to 'src/qt-win32.patch')
| -rw-r--r-- | src/qt-win32.patch | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/src/qt-win32.patch b/src/qt-win32.patch index d2a5c65..dfb26fb 100644 --- a/src/qt-win32.patch +++ b/src/qt-win32.patch @@ -56,27 +56,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. *s60main/s60main.pro) continue ;; */qmake/qmake.pro) continue ;; *tools/bootstrap*|*tools/moc*|*tools/rcc*|*tools/uic*) SPEC=$QMAKESPEC ;; ---- qt-everywhere-opensource-src-4.6.0-tp1.native/src/gui/inputmethod/qwininputcontext_win.cpp 2009-09-07 13:00:30.000000000 +0200 -+++ qt-everywhere-opensource-src-4.6.0-tp1/src/gui/inputmethod/qwininputcontext_win.cpp 2009-10-02 09:57:20.000000000 +0200 -@@ -49,6 +49,8 @@ - #include "qtextformat.h" - #include "qtextboundaryfinder.h" - -+bool qt_sendSpontaneousEvent(QObject*, QEvent*); -+ - //#define Q_IME_DEBUG - - #ifdef Q_IME_DEBUG ---- qt-everywhere-opensource-src-4.6.0-tp1.native/mkspecs/win32-g++/qplatformdefs.h 2009-09-07 13:00:28.000000000 +0200 -+++ qt-everywhere-opensource-src-4.6.0-tp1/mkspecs/win32-g++/qplatformdefs.h 2009-10-02 09:57:20.000000000 +0200 -@@ -160,5 +160,7 @@ - # define W_OK 2 - # define R_OK 4 - -+// for some reason this isn't declared where it should be -+LRESULT CALLBACK qt_internal_proc(HWND hwnd, UINT message, WPARAM wp, LPARAM lp); - - #endif // QPLATFORMDEFS_H --- qt-everywhere-opensource-src-4.6.0-tp1.native/mkspecs/win32-g++/qmake.conf 2009-09-07 13:00:28.000000000 +0200 +++ qt-everywhere-opensource-src-4.6.0-tp1/mkspecs/win32-g++/qmake.conf 2009-10-02 09:57:20.000000000 +0200 @@ -3,23 +3,30 @@ |