|
|
|
@ -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
|
|
|
|
|
--- 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-08 08:11:23.102987467 +0100
|
|
|
|
|
@@ -7,6 +7,7 @@
|
|
|
|
|
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-win32//mkspecs/win32-g++/qmake.conf 2011-02-10 09:58:01.942577519 +0100
|
|
|
|
|
@@ -6,7 +6,8 @@
|
|
|
|
|
|
|
|
|
|
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 += qt warn_on release link_prl copy_dir_files debug_and_release debug_and_release_target precompile_header
|
|
|
|
|
+CONFIG += qt warn_off release link_prl copy_dir_files precompile_header
|
|
|
|
|
+CONFIG += rtti exceptions
|
|
|
|
|
QT += core gui
|
|
|
|
|
DEFINES += UNICODE QT_LARGEFILE_SUPPORT
|
|
|
|
@ -98,10 +100,9 @@ diff -ru qt-everywhere-opensource-src-4.7.1/mkspecs/win32-g++/qmake.conf qt-ever |
|
|
|
|
+QMAKE_STRIP = i586-mingw32msvc-strip
|
|
|
|
|
QMAKE_STRIPFLAGS_LIB += --strip-unneeded
|
|
|
|
|
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
|
|
|
|
|
--- 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
|
|
|
|
|
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-win32//src/corelib/codecs/codecs.pri 2011-02-07 10:53:54.182322572 +0100
|
|
|
|
|
@@ -19,7 +19,7 @@
|
|
|
|
|
codecs/qutfcodec.cpp \
|
|
|
|
|
codecs/qtextcodecplugin.cpp
|
|
|
|
@ -118,10 +119,9 @@ diff -ru qt-everywhere-opensource-src-4.7.1/src/corelib/codecs/codecs.pri qt-eve |
|
|
|
|
-}
|
|
|
|
|
+#}
|
|
|
|
|
symbian:LIBS += -lcharconv
|
|
|
|
|
Nur in qt-everywhere-opensource-src-4.7.1-win32/src/corelib/codecs: codecs.pri~.
|
|
|
|
|
diff -ru qt-everywhere-opensource-src-4.7.1/src/corelib/tools/qlocale.cpp qt-everywhere-opensource-src-4.7.1-win32/src/corelib/tools/qlocale.cpp
|
|
|
|
|
--- qt-everywhere-opensource-src-4.7.1/src/corelib/tools/qlocale.cpp 2011-02-07 10:48:53.546970826 +0100
|
|
|
|
|
+++ qt-everywhere-opensource-src-4.7.1-win32/src/corelib/tools/qlocale.cpp 2011-02-07 10:55:03.155020600 +0100
|
|
|
|
|
diff -ru qt-everywhere-opensource-src-4.7.1//src/corelib/tools/qlocale.cpp qt-everywhere-opensource-src-4.7.1-win32//src/corelib/tools/qlocale.cpp
|
|
|
|
|
--- qt-everywhere-opensource-src-4.7.1//src/corelib/tools/qlocale.cpp 2011-02-07 10:48:53.546970826 +0100
|
|
|
|
|
+++ qt-everywhere-opensource-src-4.7.1-win32//src/corelib/tools/qlocale.cpp 2011-02-07 10:55:03.155020600 +0100
|
|
|
|
|
@@ -6624,18 +6624,18 @@
|
|
|
|
|
{
|
|
|
|
|
// Some values of the floating-point control word can cause _qdtoa to crash with an underflow.
|
|
|
|
|