summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2011-01-10 19:09:24 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2011-01-17 12:37:53 (GMT)
commit0953ee31dba532603fb7dfbde78c99aafb048bef (patch)
tree022fd7e924509a2efc9f3044a74d84360b2f0d4b /mkspecs
parent4bc1261774b8c874440e29807888b6a95cc19b1f (diff)
downloadQt-0953ee31dba532603fb7dfbde78c99aafb048bef.zip
Qt-0953ee31dba532603fb7dfbde78c99aafb048bef.tar.gz
Qt-0953ee31dba532603fb7dfbde78c99aafb048bef.tar.bz2
fix -enable-stdcall-fixup usage
the leading "-Wl," was apparently accidentally split off to the wrong line. Task-number: QTBUG-15391 Reviewed-by: mariusSO
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/win32-g++/qmake.conf4
1 files changed, 2 insertions, 2 deletions
diff --git a/mkspecs/win32-g++/qmake.conf b/mkspecs/win32-g++/qmake.conf
index ec216aa..2d9833b 100644
--- a/mkspecs/win32-g++/qmake.conf
+++ b/mkspecs/win32-g++/qmake.conf
@@ -52,8 +52,8 @@ QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
QMAKE_LINK = g++
QMAKE_LINK_C = gcc
-QMAKE_LFLAGS = -enable-stdcall-fixup -Wl,-enable-auto-import -Wl,-enable-runtime-pseudo-reloc
-QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads -Wl
+QMAKE_LFLAGS = -Wl,-enable-stdcall-fixup -Wl,-enable-auto-import -Wl,-enable-runtime-pseudo-reloc
+QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads
QMAKE_LFLAGS_EXCEPTIONS_OFF =
QMAKE_LFLAGS_RELEASE = -Wl,-s
QMAKE_LFLAGS_DEBUG =