web/surfer
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

next try; refs #22

Browse Source
This commit is contained in:
Marc Wäckerlin
2011-02-07 14:58:00 +00:00
parent 0f92a587e1
commit 625bef520e
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
qt/patch/qt-sources-for-mingw-cross-compile.diff
View File

@@ -1,10 +1,12 @@
diff -ru qt-everywhere-opensource-src-4.7.1/mkspecs/win32-g++/qmake.conf qt-everywhere-opensource-src-4.7.1-win32/mkspecs/win32-g++/qmake.conf diff -ru qt-everywhere-opensource-src-4.7.1/mkspecs/win32-g++/qmake.conf qt-everywhere-opensource-src-4.7.1-win32/mkspecs/win32-g++/qmake.conf
--- qt-everywhere-opensource-src-4.7.1/mkspecs/win32-g++/qmake.conf 2011-02-07 10:46:01.395271865 +0100 --- qt-everywhere-opensource-src-4.7.1/mkspecs/win32-g++/qmake.conf 2011-02-07 10:46:01.395271865 +0100
+++ qt-everywhere-opensource-src-4.7.1-win32/mkspecs/win32-g++/qmake.conf 2011-02-07 10:52:55.911594518 +0100 +++ qt-everywhere-opensource-src-4.7.1-win32/mkspecs/win32-g++/qmake.conf 2011-02-07 16:33:39.376213024 +0100
@@ -7,6 +7,7 @@ @@ -6,7 +6,8 @@
MAKEFILE_GENERATOR = MINGW MAKEFILE_GENERATOR = MINGW
TEMPLATE = app TEMPLATE = app
CONFIG += qt warn_on release link_prl copy_dir_files debug_and_release debug_and_release_target precompile_header -CONFIG += qt warn_on release link_prl copy_dir_files debug_and_release debug_and_release_target precompile_header
+CONFIG += qt warn_off link_prl copy_dir_files
+CONFIG += rtti exceptions +CONFIG += rtti exceptions
QT += core gui QT += core gui
DEFINES += UNICODE QT_LARGEFILE_SUPPORT DEFINES += UNICODE QT_LARGEFILE_SUPPORT
@@ -98,6 +100,7 @@ diff -ru qt-everywhere-opensource-src-4.7.1/mkspecs/win32-g++/qmake.conf qt-ever
+QMAKE_STRIP = i586-mingw32msvc-strip +QMAKE_STRIP = i586-mingw32msvc-strip
QMAKE_STRIPFLAGS_LIB += --strip-unneeded QMAKE_STRIPFLAGS_LIB += --strip-unneeded
load(qt_config) load(qt_config)
Nur in qt-everywhere-opensource-src-4.7.1-win32/mkspecs/win32-g++: qmake.conf~.
diff -ru qt-everywhere-opensource-src-4.7.1/src/corelib/codecs/codecs.pri qt-everywhere-opensource-src-4.7.1-win32/src/corelib/codecs/codecs.pri diff -ru qt-everywhere-opensource-src-4.7.1/src/corelib/codecs/codecs.pri qt-everywhere-opensource-src-4.7.1-win32/src/corelib/codecs/codecs.pri
--- qt-everywhere-opensource-src-4.7.1/src/corelib/codecs/codecs.pri 2011-02-07 10:48:52.396759040 +0100 --- qt-everywhere-opensource-src-4.7.1/src/corelib/codecs/codecs.pri 2011-02-07 10:48:52.396759040 +0100
+++ qt-everywhere-opensource-src-4.7.1-win32/src/corelib/codecs/codecs.pri 2011-02-07 10:53:54.182322572 +0100 +++ qt-everywhere-opensource-src-4.7.1-win32/src/corelib/codecs/codecs.pri 2011-02-07 10:53:54.182322572 +0100