diff options
| author | Martin Smith <msmith@trolltech.com> | 2010-03-04 14:22:27 (GMT) |
|---|---|---|
| committer | Martin Smith <msmith@trolltech.com> | 2010-03-04 14:22:27 (GMT) |
| commit | c3d5e6703777f294e5af12a0871defd339f1c1ff (patch) | |
| tree | 7bf4bd3416cda1f6f677590efce6f9aec2138721 /qmake/Makefile.win32-g++-sh | |
| parent | 4b3953678983b3da925066f464b55340fab3503c (diff) | |
| parent | a0cb1ae902dce0c00dc2de8b92229d66945054c8 (diff) | |
| download | Qt-c3d5e6703777f294e5af12a0871defd339f1c1ff.zip Qt-c3d5e6703777f294e5af12a0871defd339f1c1ff.tar.gz Qt-c3d5e6703777f294e5af12a0871defd339f1c1ff.tar.bz2 | |
Merge branch '4.7' of git@scm.dev.nokia.troll.no:qt/oslo-staging-1 into 4.7
Diffstat (limited to 'qmake/Makefile.win32-g++-sh')
| -rw-r--r-- | qmake/Makefile.win32-g++-sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/Makefile.win32-g++-sh b/qmake/Makefile.win32-g++-sh index 5061089..f7b486f 100644 --- a/qmake/Makefile.win32-g++-sh +++ b/qmake/Makefile.win32-g++-sh @@ -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_BOOTSTRAPPED CXXFLAGS = $(CFLAGS) -LFLAGS = +LFLAGS = -static-libgcc -s LIBS = -lole32 -luuid LINKQMAKE = g++ $(LFLAGS) -o qmake.exe $(OBJS) $(QTOBJS) $(LIBS) ADDCLEAN = |