qiurui
/
qtbase
mirror of https://github.com/qt/qtbase.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Windows: Adapt mkspec for MinGW / gcc 4.6. 

gcc 4.6 becomes the minimum required version in Qt 5.

See also d4150975af620e2889cc58bd476bac6b4d101db3
in Qt 4.8.

Change-Id: If66ce0be755263c20b0a4371523c6590592d962d
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>
This commit is contained in:
Friedemann Kleint 2011-11-17 09:18:05 +01:00 committed by Qt by Nokia
parent 9cfd34c8d9
commit f6c61d13a3
4 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mkspecs/win32-g++/qmake.conf
View File

@ -1,7 +1,7 @@
# #
# qmake configuration for win32-g++ # qmake configuration for win32-g++
# #
# Written for MinGW # Written for MinGW / gcc 4.6 or higher
# #
MAKEFILE_GENERATOR = MINGW MAKEFILE_GENERATOR = MINGW
@ -19,7 +19,7 @@ QMAKE_LEX = flex
QMAKE_LEXFLAGS = QMAKE_LEXFLAGS =
QMAKE_YACC = byacc QMAKE_YACC = byacc
QMAKE_YACCFLAGS = -d QMAKE_YACCFLAGS = -d
QMAKE_CFLAGS = QMAKE_CFLAGS = -fno-keep-inline-dllexport
QMAKE_CFLAGS_DEPS = -M QMAKE_CFLAGS_DEPS = -M
QMAKE_CFLAGS_WARN_ON = -Wall QMAKE_CFLAGS_WARN_ON = -Wall
QMAKE_CFLAGS_WARN_OFF = -w QMAKE_CFLAGS_WARN_OFF = -w

2
qmake/Makefile.win32-g++
View File

@ -27,7 +27,7 @@ CFLAGS = -c -o$@ -O \
-DQT_BUILD_QMAKE -DQT_NO_THREAD -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM \ -DQT_BUILD_QMAKE -DQT_NO_THREAD -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM \
-DQT_BOOTSTRAPPED -DQT_BOOTSTRAPPED
CXXFLAGS = $(CFLAGS) CXXFLAGS = $(CFLAGS)
LFLAGS = -static-libgcc -static-libstdc++ -s LFLAGS = -static-libgcc -s
LIBS = -lole32 -luuid -ladvapi32 -lkernel32 LIBS = -lole32 -luuid -ladvapi32 -lkernel32
LINKQMAKE = g++ $(LFLAGS) -o qmake.exe $(OBJS) $(QTOBJS) $(LIBS) LINKQMAKE = g++ $(LFLAGS) -o qmake.exe $(OBJS) $(QTOBJS) $(LIBS)
ADDCLEAN = ADDCLEAN =

2
qmake/Makefile.win32-g++-sh
View File

@ -27,7 +27,7 @@ CFLAGS = -c -o$@ -O \
-DQT_BUILD_QMAKE -DQT_NO_THREAD -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM \ -DQT_BUILD_QMAKE -DQT_NO_THREAD -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM \
-DQT_BOOTSTRAPPED -DQT_BOOTSTRAPPED
CXXFLAGS = $(CFLAGS) CXXFLAGS = $(CFLAGS)
LFLAGS = -static-libgcc -static-libstdc++ -s LFLAGS = -static-libgcc -s
LIBS = -lole32 -luuid -ladvapi32 -lkernel32 LIBS = -lole32 -luuid -ladvapi32 -lkernel32
LINKQMAKE = g++ $(LFLAGS) -o qmake.exe $(OBJS) $(QTOBJS) $(LIBS) LINKQMAKE = g++ $(LFLAGS) -o qmake.exe $(OBJS) $(QTOBJS) $(LIBS)
ADDCLEAN = ADDCLEAN =

7
src/corelib/tools/qlocale_tools.cpp
View File

@ -2253,6 +2253,13 @@ static int quorem(Bigint *b, Bigint *S)
* calculation. * calculation.
*/ */
#if defined(Q_OS_WIN) && defined (Q_CC_GNU) && !defined(_clear87) // See QTBUG-7576
extern "C" {
__attribute__ ((dllimport)) unsigned int __cdecl __MINGW_NOTHROW _control87 (unsigned int unNew, unsigned int unMask);
__attribute__ ((dllimport)) unsigned int __cdecl __MINGW_NOTHROW _clearfp (void); /* Clear the FPU status word */
}
# define _clear87 _clearfp
#endif
/* This actually sometimes returns a pointer to a string literal /* This actually sometimes returns a pointer to a string literal
cast to a char*. Do NOT try to modify the return value. */ cast to a char*. Do NOT try to modify the return value. */