Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- --- qt-win-opensource-src-4.3.1/src/gui/inputmethod/qwininputcontext_win.cpp.orig 2007-09-11 20:23:53.000000000 +0200
- +++ qt-win-opensource-src-4.3.1/src/gui/inputmethod/qwininputcontext_win.cpp 2007-09-11 21:07:24.000000000 +0200
- @@ -45,6 +45,8 @@
- #include "qevent.h"
- #include "qtextformat.h"
- +bool qt_sendSpontaneousEvent(QObject*, QEvent*);
- +
- //#define Q_IME_DEBUG
- /* Active Input method support on Win95/98/NT */
- --- qt-win-opensource-src-4.3.1/mkspecs/win32-g++/qplatformdefs.h.orig 2007-09-11 21:08:34.000000000 +0200
- +++ qt-win-opensource-src-4.3.1/mkspecs/win32-g++/qplatformdefs.h 2007-09-11 21:08:33.000000000 +0200
- @@ -157,5 +157,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-win-opensource-src-4.3.1/mkspecs/win32-g++/qmake.conf.orig 2007-08-07 15:03:57.000000000 +0200
- +++ qt-win-opensource-src-4.3.1/mkspecs/win32-g++/qmake.conf 2007-09-11 21:10:42.000000000 +0200
- @@ -3,23 +3,30 @@
- #
- # Written for MinGW
- #
- +load(qt_config)
- MAKEFILE_GENERATOR = MINGW
- TEMPLATE = app
- CONFIG += qt warn_on release link_prl copy_dir_files debug_and_release debug_and_release_target precompile_header
- +CONFIG += exceptions windows win32
- +CONFIG -= freetype
- +QT_CONFIG -= freetype
- QT += core gui
- DEFINES += UNICODE QT_LARGEFILE_SUPPORT
- +DEFINES -= QT_LARGEFILE_SUPPORT
- +DEFINES += QT_TABLET QT_SESSIONMANAGER QT_NO_DIRECT3D QT_NO_CODECS
- QMAKE_COMPILER_DEFINES += __GNUC__ WIN32
- QMAKE_EXT_OBJ = .o
- QMAKE_EXT_RES = _res.o
- -QMAKE_CC = gcc
- +QMAKE_CC = mingw32-gcc
- QMAKE_LEX = flex
- QMAKE_LEXFLAGS =
- QMAKE_YACC = byacc
- QMAKE_YACCFLAGS = -d
- QMAKE_CFLAGS =
- +QMAKE_CFLAGS += -isystem /usr/mingw32/usr/include
- QMAKE_CFLAGS_DEPS = -M
- QMAKE_CFLAGS_WARN_ON = -Wall
- QMAKE_CFLAGS_WARN_OFF = -w
- @@ -27,7 +34,7 @@
- QMAKE_CFLAGS_DEBUG = -g
- QMAKE_CFLAGS_YACC = -Wno-unused -Wno-parentheses
- -QMAKE_CXX = g++
- +QMAKE_CXX = mingw32-g++
- QMAKE_CXXFLAGS = $$QMAKE_CFLAGS
- QMAKE_CXXFLAGS_DEPS = $$QMAKE_CFLAGS_DEPS
- QMAKE_CXXFLAGS_WARN_ON = $$QMAKE_CFLAGS_WARN_ON
- @@ -42,6 +49,7 @@
- QMAKE_CXXFLAGS_EXCEPTIONS_OFF = -fno-exceptions
- QMAKE_INCDIR =
- +QMAKE_INCDIR += .
- QMAKE_INCDIR_QT = $$[QT_INSTALL_HEADERS]
- QMAKE_LIBDIR_QT = $$[QT_INSTALL_LIBS]
- @@ -50,7 +58,7 @@
- QMAKE_RUN_CXX = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $obj $src
- QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
- -QMAKE_LINK = g++
- +QMAKE_LINK = mingw32-g++
- QMAKE_LFLAGS = -enable-stdcall-fixup -Wl,-enable-auto-import -Wl,-enable-runtime-pseudo-reloc
- QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads -Wl
- QMAKE_LFLAGS_EXCEPTIONS_OFF =
- @@ -71,11 +79,13 @@
- QMAKE_LIBS_COMPAT = -ladvapi32 -lshell32 -lcomdlg32 -luser32 -lgdi32 -lws2_32
- QMAKE_LIBS_QT_ENTRY = -lmingw32 -lqtmain
- +QMAKE_SH = bash
- +
- !isEmpty(QMAKE_SH) {
- MINGW_IN_SHELL = 1
- QMAKE_DIR_SEP = /
- QMAKE_COPY = cp
- - QMAKE_COPY_DIR = xcopy /s /q /y /i
- + QMAKE_COPY_DIR = cp -r
- QMAKE_MOVE = mv
- QMAKE_DEL_FILE = rm
- QMAKE_MKDIR = mkdir
- @@ -91,15 +101,15 @@
- QMAKE_CHK_DIR_EXISTS = if not exist
- }
- -QMAKE_MOC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}moc.exe
- -QMAKE_UIC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}uic.exe
- -QMAKE_IDC = $$[QT_INSTALL_BINS]$${DIR_SEPARATOR}idc.exe
- -
- -QMAKE_IDL = midl
- -QMAKE_LIB = ar -ru
- -QMAKE_RC = windres
- +QMAKE_MOC = moc
- +QMAKE_UIC = uic
- +QMAKE_IDC = idc
- +QMAKE_RCC = rcc
- +
- +#QMAKE_IDL = midl
- +QMAKE_LIB = mingw32-ar -ru
- +QMAKE_RC = mingw32-windres
- QMAKE_ZIP = zip -r -9
- -QMAKE_STRIP = strip
- +QMAKE_STRIP = mingw32-strip
- QMAKE_STRIPFLAGS_LIB += --strip-unneeded
- -load(qt_config)
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
