diff options
| author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-15 18:12:04 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2013-01-15 18:14:13 +0100 |
| commit | 270a51b7758794d47d5ffb892c35989a87b90628 (patch) | |
| tree | c2b8b7728619a3d690978e07dd94cced48d4d9f2 /qmake | |
| parent | cd7ba89a07f794b17fc66ba29515b104c4d21f27 (diff) | |
| parent | 4cad9e466784ec54e3cf6f216d3df20ba7a595b0 (diff) | |
Merge remote-tracking branch 'gerrit/release' into stable
Change-Id: Ieb104d0e390218a063082c93bc9c7e412af2166d
Diffstat (limited to 'qmake')
| -rw-r--r-- | qmake/Makefile.win32-g++ | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/Makefile.win32-g++ b/qmake/Makefile.win32-g++ index 7bc24edef9..565d5d2d51 100644 --- a/qmake/Makefile.win32-g++ +++ b/qmake/Makefile.win32-g++ @@ -54,7 +54,7 @@ CFLAGS = -c -o$@ -O \ -DQT_NO_THREAD -DQT_NO_QOBJECT -DQT_NO_GEOM_VARIANT -DQT_NO_DATASTREAM \ -DUNICODE CXXFLAGS = $(CFLAGS) -LFLAGS = -static-libgcc -s +LFLAGS = -static -s LIBS = -lole32 -luuid -ladvapi32 -lkernel32 LINKQMAKE = g++ $(LFLAGS) -o qmake.exe $(OBJS) $(QTOBJS) $(LIBS) ADDCLEAN = |