summaryrefslogtreecommitdiffstats
path: root/mkspecs
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2011-03-28 23:31:29 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2011-03-28 23:31:29 (GMT)
commitc0f5eeec92f188381d7f085b2d4f5ea08ecc665c (patch)
treeaf8e77d9c9fd297fd0bc35aa2369fadd3a6bdcde /mkspecs
parent7884b913c006402eded0bfe36053c9c557d8d9d6 (diff)
parent45c4c792c48605de4cbc28637a39bce5a65b1613 (diff)
downloadQt-c0f5eeec92f188381d7f085b2d4f5ea08ecc665c.zip
Qt-c0f5eeec92f188381d7f085b2d4f5ea08ecc665c.tar.gz
Qt-c0f5eeec92f188381d7f085b2d4f5ea08ecc665c.tar.bz2
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7-integration
* '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-1: Update changes for 4.7.3 directfb: avoid version dependency by setting DSPD_DST blend functions manually fix -enable-stdcall-fixup usage Report that an update is needed if no update was done
Diffstat (limited to 'mkspecs')
-rw-r--r--mkspecs/unsupported/win32-g++-cross/qmake.conf4
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 7e077a1..efc3de2 100644
--- a/mkspecs/unsupported/win32-g++-cross/qmake.conf
+++ b/mkspecs/unsupported/win32-g++-cross/qmake.conf
@@ -52,8 +52,8 @@ QMAKE_RUN_CXX_IMP = $(CXX) -c $(CXXFLAGS) $(INCPATH) -o $@ $<
QMAKE_LINK = i686-pc-mingw32-g++
QMAKE_LINK_C = i686-pc-mingw32-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 =