summaryrefslogtreecommitdiffstats
path: root/qmake
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@nokia.com>2009-06-08 12:12:17 (GMT)
committerOswald Buddenhagen <oswald.buddenhagen@nokia.com>2009-06-08 12:12:17 (GMT)
commit21fef75cd50b00609a803f123cc27ad0ee9ba509 (patch)
treeca96462e89b9c4828c7792e62def95e77d69d277 /qmake
parent11303c676166cda3aae33e7e97939e9d2942271f (diff)
parent61d1dcea0efa6b0809639b781bb49baf252b3aad (diff)
downloadQt-21fef75cd50b00609a803f123cc27ad0ee9ba509.zip
Qt-21fef75cd50b00609a803f123cc27ad0ee9ba509.tar.gz
Qt-21fef75cd50b00609a803f123cc27ad0ee9ba509.tar.bz2
Merge commit 'origin/4.5'
Conflicts: src/3rdparty/phonon/qt7/mediaobject.mm src/3rdparty/phonon/qt7/quicktimevideoplayer.mm src/gui/text/qfontengine_win.cpp tools/linguist/shared/cpp.cpp
Diffstat (limited to 'qmake')
-rw-r--r--qmake/Makefile.win322
1 files changed, 1 insertions, 1 deletions
diff --git a/qmake/Makefile.win32 b/qmake/Makefile.win32
index 39bac81..53130aa 100644
--- a/qmake/Makefile.win32
+++ b/qmake/Makefile.win32
@@ -41,7 +41,7 @@ CFLAGS = -c -Fo$@ \
CXXFLAGS = $(CFLAGS)
LFLAGS =
LIBS = ole32.lib advapi32.lib
-LINKQMAKE = $(LINK) $(LFLAGS) -DEBUG -OUT:qmake.exe $(OBJS) $(QTOBJS) $(LIBS)
+LINKQMAKE = $(LINK) $(LFLAGS) -OUT:qmake.exe $(OBJS) $(QTOBJS) $(LIBS)
ADDCLEAN = vc60.pdb vc70.pdb qmake.pdb qmake.ilk
!ELSE