diff options
author | Mark Brand <mabrand@mabrand.nl> | 2012-01-11 00:26:22 +0100 |
---|---|---|
committer | Qt by Nokia <qt-info@nokia.com> | 2012-01-12 00:01:20 +0100 |
commit | dd22fe636b026dfc7413f4b3e564f5f1b4a791de (patch) | |
tree | 21d20d0c3dcb079fd3b7bd359bc13fc8ef1f9dc1 /mkspecs | |
parent | e77ef98683a7f68ec44e9f214bfb2277de6308e2 (diff) |
Windows: Adapt cross mkspec for MinGW / gcc 4.6.
4.6 becomes the minimum required version in Qt 5.
This commit follows f6c61d13a3e166fc9280e8bfe8325cead335d0da.
Change-Id: I151cd5ae63f076c4aa766bc5c9b9fb4d8fcd4f79
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>
Diffstat (limited to 'mkspecs')
-rw-r--r-- | mkspecs/unsupported/win32-g++-cross/qmake.conf | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/unsupported/win32-g++-cross/qmake.conf b/mkspecs/unsupported/win32-g++-cross/qmake.conf index 97a088c222..7f41c8aab3 100644 --- a/mkspecs/unsupported/win32-g++-cross/qmake.conf +++ b/mkspecs/unsupported/win32-g++-cross/qmake.conf @@ -1,7 +1,7 @@ # # qmake configuration for win32-g++-cross # -# Written for MinGW cross building on Unix +# Written for MinGW cross building on Unix / gcc 4.6 or higher # MAKEFILE_GENERATOR = MINGW @@ -19,7 +19,7 @@ QMAKE_LEX = flex QMAKE_LEXFLAGS = QMAKE_YACC = byacc QMAKE_YACCFLAGS = -d -QMAKE_CFLAGS = -pipe +QMAKE_CFLAGS = -pipe -fno-keep-inline-dllexport QMAKE_CFLAGS_DEPS = -M QMAKE_CFLAGS_WARN_ON = -Wall QMAKE_CFLAGS_WARN_OFF = -w |